summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xprogram/include/rcube_template.php21
1 files changed, 16 insertions, 5 deletions
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index a9de54d76..1a83e5ca3 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -332,12 +332,18 @@ class rcube_template extends rcube_html_page
private function parse($name = 'main', $exit = true)
{
$skin_path = $this->config['skin_path'];
+ $plugin = false;
- $temp = explode(".", $name, 2);
- if (count($temp) > 1) {
- $path = $this->config['plugins_dir'] . '/' . $temp[0] . '/skins/' . $this->config['skin'] . '/templates/' . $temp[1] . '.html';
- } else
- $path = "$skin_path/templates/$name.html";
+ $temp = explode(".", $name, 2);
+ if (count($temp) > 1) {
+ $plugin = $temp[0];
+ $name = $temp[1];
+ $skin_path = $this->config['plugins_dir'] . '/' . $temp[0] . '/skins/' . $this->config['skin'];
+ if (!is_dir($skin_path)) // fallback to default skin
+ $skin_path = $this->config['plugins_dir'] . '/' . $temp[0] . '/skins/default';
+ }
+
+ $path = "$skin_path/templates/$name.html";
// read template file
if (($templ = @file_get_contents($path)) === false) {
@@ -350,6 +356,11 @@ class rcube_template extends rcube_html_page
), true, true);
return false;
}
+
+ // replace all path references to plugins/... with the current plugins dir
+ if ($plugin) {
+ $templ = preg_replace('/\bplugins\//', $this->config['plugins_dir'].'/', $templ);
+ }
// parse for specialtags
$output = $this->parse_conditions($templ);