Next step: introduce the application class 'rcmail' and get rid of some glo...

thomascube

2008-04-30 197601ef5fa2e6aaabfb6e0baaf56179f7cc1ee3

 program/include/rcube_json_output.php

@@ -41,10 +41,10 @@
    /**
     * Constructor
     */
    public function __construct(&$config, $task)
    public function __construct($task)
    {
        $this->task   = $task;
        $this->config = $config;
        $this->config = rcmail::get_instance()->config;
    }
    
    
@@ -211,7 +211,10 @@
     */
    private function get_js_commands()
    {
        $out = 'this.set_env('.json_serialize($this->env).");\n";
        $out = '';
	
   if (sizeof($this->env))
       $out .= 'this.set_env('.json_serialize($this->env).");\n";
        
        foreach($this->texts as $name => $text) {
            $out .= sprintf("this.add_label('%s', '%s');\n", $name, JQ($text));