From 7dbe2fa6bf629e1089c61a7bb89885e9936de8a9 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 25 May 2009 05:22:59 -0400
Subject: [PATCH] - get rid of 'plugins_dir' option, plugins directory must be in Roundcube root (like skins)
---
program/include/rcube_template.php | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index f6718e3..dc4b5e1 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -338,9 +338,12 @@
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';
+ $skin_dir = $plugin . '/skins/' . $this->config['skin'];
+ $skin_path = $this->app->plugins->dir . $skin_dir;
+ if (!is_dir($skin_path)) { // fallback to default skin
+ $skin_dir = $plugin . '/skins/default';
+ $skin_path = $this->app->plugins->dir . $skin_dir;
+ }
}
$path = "$skin_path/templates/$name.html";
@@ -360,7 +363,7 @@
// replace all path references to plugins/... with the configured plugins dir
// and /this/ to the current plugin skin directory
if ($plugin) {
- $templ = preg_replace(array('/\bplugins\//', '/(["\']?)\/this\//'), array($this->config['plugins_dir'].'/', "\\1$skin_path/"), $templ);
+ $templ = preg_replace(array('/\bplugins\//', '/(["\']?)\/this\//'), array($this->app->plugins->url, '\\1'.$this->app->plugins->url.$skin_dir.'/'), $templ);
}
// parse for specialtags
@@ -792,9 +795,6 @@
}
else if (in_array($attrib['command'], $a_static_commands)) {
$attrib['href'] = rcmail_url($attrib['command']);
- }
- else if ($attrib['command'] == 'permaurl' && !empty($this->env['permaurl'])) {
- $attrib['href'] = $this->env['permaurl'];
}
}
--
Gitblit v1.9.1