Reset internal $skins property is set_skin()

roundcube · Sep 8, 2019 · b10a0db · b10a0db
1 parent 5373f18
commit b10a0db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
@@ -99,12 +99,12 @@ protected function startup()
         $required_plugins = array('filesystem_attachments', 'jqueryui');
         $this->plugins->load_plugins($plugins, $required_plugins);
 
-        // Remember default skin, before it's replaced by user prefs
-        $this->default_skin = $this->config->get('skin');
-
         // start session
         $this->session_init();
 
+        // Remember default skin, before it's replaced by user prefs
+        $this->default_skin = $this->config->get('skin');
+
         // create user object
         $this->set_user(new rcube_user($_SESSION['user_id']));
 

diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
@@ -285,6 +285,7 @@ public function set_skin($skin)
 
         // register skin path(s)
         $this->skin_paths = array();
+        $this->skins      = array();
         $this->load_skin($skin_path);
 
         $this->skin_name = $skin;

diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
@@ -380,9 +380,11 @@ public function local_skin_path()
     {
         $rcube = rcube::get_instance();
         $skins = array_keys((array)$rcube->output->skins);
+
         if (empty($skins)) {
             $skins = (array) $rcube->config->get('skin');
         }
+
         foreach ($skins as $skin) {
             $skin_path = 'skins/' . $skin;
             if (is_dir(realpath(slashify($this->home) . $skin_path))) {