Changeset 4091 in subversion


Ignore:
Timestamp:
Oct 14, 2010 1:02:25 PM (3 years ago)
Author:
alec
Message:
  • Fix bug in rcube_plugin::local_skin_path()
Location:
trunk/roundcubemail/program/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/program/include/rcube_json_output.php

    r4083 r4091  
    3636    private $config; 
    3737    private $charset = RCMAIL_CHARSET; 
    38     private $env = array(); 
    3938    private $texts = array(); 
    4039    private $commands = array(); 
    … …  
    4342 
    4443    public $browser; 
     44    public $env = array(); 
    4545    public $type = 'js'; 
    4646    public $ajax_call = true; 

  • trunk/roundcubemail/program/include/rcube_plugin.php

    r4015 r4091  
    248248  protected function local_skin_path() 
    249249  { 
    250       $skin_path = 'skins/'.$this->api->output->config['skin']; 
     250      $skin_path = 'skins/'.$this->api->config->get('skin'); 
    251251      if (!is_dir(realpath(slashify($this->home) . $skin_path))) 
    252252        $skin_path = 'skins/default'; 

  • trunk/roundcubemail/program/include/rcube_plugin_api.php

    r4015 r4091  
    3232  public $url = 'plugins/'; 
    3333  public $output; 
     34  public $config; 
    3435   
    3536  public $handlers = array(); 
    … …  
    4041  private $objectsmap = array(); 
    4142  private $template_contents = array(); 
    42    
    4343  private $required_plugins = array('filesystem_attachments'); 
    4444  private $active_hook = false; 
    … …  
    108108    $rcmail = rcmail::get_instance(); 
    109109    $this->output = $rcmail->output; 
     110    $this->config = $rcmail->config; 
    110111 
    111112    $plugins_dir = dir($this->dir); 

  • trunk/roundcubemail/program/include/rcube_template.php

    r4083 r4091  
    3131class rcube_template extends rcube_html_page 
    3232{ 
    33     var $app; 
    34     var $config; 
    35     var $framed = false; 
    36     var $pagetitle = ''; 
    37     var $message = null; 
    38     var $env = array(); 
    39     var $js_env = array(); 
    40     var $js_commands = array(); 
    41     var $object_handlers = array(); 
     33    private $app; 
     34    private $config; 
     35    private $pagetitle = ''; 
     36    private $message = null; 
     37    private $js_env = array(); 
     38    private $js_commands = array(); 
     39    private $object_handlers = array(); 
    4240 
    4341    public $browser; 
     42    public $framed = false; 
     43    public $env = array(); 
    4444    public $type = 'html'; 
    4545    public $ajax_call = false; 
Note: See TracChangeset for help on using the changeset viewer.