diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_plugin.php | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -61,6 +61,7 @@ CHANGELOG Roundcube Webmail - Fix handling of UNKNOWN-CTE response, try do decode content client-side (#1490046) - Fix bug where creating subfolders in shared folders wasn't possible without ACL extension (#1490113) - Fix reply scrolling issue with text mode and start message below the quote (#1490114) +- Fix possible issues in skin/skin_path config handling (#1490125) RELEASE 1.0.3 ------------- diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 0f2a0a6d5..3d2f51ba1 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -187,6 +187,8 @@ EOF; $valid = !$skin; } + $skin_path = rtrim($skin_path, '/'); + $this->config->set('skin_path', $skin_path); $this->base_path = $skin_path; diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php index 326f10a5c..46eec673b 100644 --- a/program/lib/Roundcube/rcube_plugin.php +++ b/program/lib/Roundcube/rcube_plugin.php @@ -422,7 +422,7 @@ abstract class rcube_plugin $rcube = rcube::get_instance(); $skins = array_keys((array)$rcube->output->skins); if (empty($skins)) { - $skins = array($rcube->config->get('skin')); + $skins = (array) $rcube->config->get('skin', 'larry'); } foreach ($skins as $skin) { $skin_path = 'skins/' . $skin; |