Fix possible issues in skin/skin_path config handling (#1490125)

Conflicts:

	program/lib/Roundcube/rcube_plugin.php

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;