Browse Source

Reset internal $skins property is set_skin()

pull/6950/head
Aleksander Machniak 6 years ago
parent
commit
b10a0dbb7e
  1. 6
      program/include/rcmail.php
  2. 1
      program/include/rcmail_output_html.php
  3. 2
      program/lib/Roundcube/rcube_plugin.php

6
program/include/rcmail.php

@ -99,12 +99,12 @@ class rcmail extends rcube
$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']));

1
program/include/rcmail_output_html.php

@ -285,6 +285,7 @@ EOF;
// register skin path(s)
$this->skin_paths = array();
$this->skins = array();
$this->load_skin($skin_path);
$this->skin_name = $skin;

2
program/lib/Roundcube/rcube_plugin.php

@ -380,9 +380,11 @@ abstract class rcube_plugin
{
$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))) {

Loading…
Cancel
Save