summaryrefslogtreecommitdiff
path: root/program/include
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:51:53 +0100
commit73b14686fc7f2ac028af4e8366e7d3882d2894a8 (patch)
treea74a4c45917c5720e85c590ca9cf29abbdc52527 /program/include
parent080f560e0fc2f910e410c0ca8cc68a88e0363a08 (diff)
Fix possible issues in skin/skin_path config handling (#1490125)
Conflicts: program/lib/Roundcube/rcube_plugin.php
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail_output_html.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 850075fcf..7a0992f3b 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -168,6 +168,8 @@ class rcmail_output_html extends rcmail_output
$valid = !$skin;
}
+ $skin_path = rtrim($skin_path, '/');
+
$this->config->set('skin_path', $skin_path);
$this->base_path = $skin_path;