summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-01-09 16:23:44 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-01-09 16:23:44 +0100
commit44e3bf1e2c18d0fae066e6c4e9a19a4c9bee12aa (patch)
treefdadb6f702fb9fe2953cb7c15fd7c4ed257a45c6 /program/include
parentdb6f54ec5f604d2629041263d6e638fa8e0ec0c7 (diff)
Fix /this/ paths from plugin templates in extended skins
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 76342c245..d4a1654f1 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -462,6 +462,7 @@ class rcmail_output_html extends rcmail_output
if (is_readable($path)) {
$this->config->set('skin_path', $skin_path);
$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
+ $skin_dir = preg_replace('!^plugins/!', '', $skin_path);
break;
}
else {
@@ -643,6 +644,7 @@ class rcmail_output_html extends rcmail_output
protected function file_callback($matches)
{
$file = $matches[3];
+ $file[0] = preg_replace('!^/this/!', '/', $file[0]);
// correct absolute paths
if ($file[0] == '/') {