From 66f68e96236848e8f1dd5992f1d7d0c5cc6da2a9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 21 May 2009 16:02:43 -0400
Subject: [PATCH] Make links with /this/ pointing to the plugins skin directory

---
 program/include/rcube_template.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 1a83e5c..f6718e3 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -357,9 +357,10 @@
             return false;
         }
         
-        // replace all path references to plugins/... with the current plugins dir
+        // replace all path references to plugins/... with the configured plugins dir
+        // and /this/ to the current plugin skin directory
         if ($plugin) {
-          $templ = preg_replace('/\bplugins\//', $this->config['plugins_dir'].'/', $templ);
+            $templ = preg_replace(array('/\bplugins\//', '/(["\']?)\/this\//'), array($this->config['plugins_dir'].'/', "\\1$skin_path/"), $templ);
         }
 
         // parse for specialtags
@@ -374,7 +375,7 @@
             );
         }
         $output = $this->parse_with_globals($output);
-        $this->write(trim($output), $skin_path);
+        $this->write(trim($output));
         if ($exit) {
             exit;
         }

--
Gitblit v1.9.1