diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-28 22:53:40 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-10-28 22:53:40 +0000 |
| commit | 5328c11135888671be7b952ab76069f8d34dbb78 (patch) | |
| tree | f489a4aaf2c9b2691086cf663e0e7c16ccdf1a06 /roundcubemail/plugins | |
| parent | d6c77ae7a1b31462b57d2b06d79167970040ab52 (diff) | |
Add fallback to default skin if the selected one is not available in plugin directory
git-svn-id: https://svn.roundcube.net/trunk@3076 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/plugins')
| -rw-r--r-- | roundcubemail/plugins/archive/archive.php | 4 | ||||
| -rw-r--r-- | roundcubemail/plugins/markasjunk/markasjunk.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/plugins/archive/archive.php b/roundcubemail/plugins/archive/archive.php index 8c855fea7..27887cef3 100644 --- a/roundcubemail/plugins/archive/archive.php +++ b/roundcubemail/plugins/archive/archive.php @@ -24,8 +24,8 @@ class archive extends rcube_plugin if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show') && ($archive_folder = $rcmail->config->get('archive_mbox'))) { - $skin_path = 'skins/'.$rcmail->output->config['skin']; - + $skin_path = $this->local_skin_path(); + $this->include_script('archive.js'); $this->add_texts('localization', true); $this->add_button( diff --git a/roundcubemail/plugins/markasjunk/markasjunk.php b/roundcubemail/plugins/markasjunk/markasjunk.php index f3e652d89..4f41a7eed 100644 --- a/roundcubemail/plugins/markasjunk/markasjunk.php +++ b/roundcubemail/plugins/markasjunk/markasjunk.php @@ -19,7 +19,7 @@ class markasjunk extends rcube_plugin $rcmail = rcmail::get_instance(); if ($rcmail->action == '' || $rcmail->action == 'show') { - $skin_path = 'skins/'.$rcmail->output->config['skin']; + $skin_path = $this->local_skin_path();; $this->include_script('markasjunk.js'); $this->add_texts('localization', true); $this->add_button(array( |