summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-30 12:34:16 +0100
committerAleksander Machniak <alec@alec.pl>2014-10-30 12:34:16 +0100
commit1ffab0ad4aa23c45e71e26b62a86887e31061079 (patch)
tree04e48d2553c9458f9e26651475649315ee9d0f38 /program
parent968601f1f5e7366ddc8aa72d00d2f727d9eab572 (diff)
Fix possible issues in skin/skin_path config handling (#1490125)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail_output_html.php2
-rw-r--r--program/lib/Roundcube/rcube_plugin.php2
2 files changed, 3 insertions, 1 deletions
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;