From f6a7491fa1332d43ac7167d50472aa514fd0caf2 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 27 Jan 2012 11:52:21 -0500
Subject: [PATCH] Fix special vars replacement in templates
---
program/include/rcube_template.php | 1 +
program/include/rcube_html_page.php | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index d026444..fffe490 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -284,7 +284,6 @@
$output = preg_replace_callback(
'!(src|href|background)=(["\']?)([a-z0-9/_.-]+)(["\'\s>])!i',
array($this, 'file_callback'), $output);
- $output = str_replace('$__skin_path', $base_path, $output);
// trigger hook with final HTML content to be sent
$hook = rcmail::get_instance()->plugins->exec_hook("send_page", array('content' => $output));
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 81dbb3d..0fbd9df 100644
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -528,6 +528,7 @@
{
$GLOBALS['__version'] = Q(RCMAIL_VERSION);
$GLOBALS['__comm_path'] = Q($this->app->comm_path);
+ $GLOBALS['__skin_path'] = Q($this->config['skin_path']);
return preg_replace_callback('/\$(__[a-z0-9_\-]+)/',
array($this, 'globals_callback'), $input);
}
--
Gitblit v1.9.1