From e1ca1bd39c0970c5d7e75bedb038c64e1d4f57ca Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 27 Jan 2012 16:52:21 +0000 Subject: Fix special vars replacement in templates git-svn-id: https://svn.roundcube.net/trunk@5838 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_html_page.php | 1 - roundcubemail/program/include/rcube_template.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/roundcubemail/program/include/rcube_html_page.php b/roundcubemail/program/include/rcube_html_page.php index d026444be..fffe49094 100644 --- a/roundcubemail/program/include/rcube_html_page.php +++ b/roundcubemail/program/include/rcube_html_page.php @@ -284,7 +284,6 @@ class rcube_html_page $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/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php index 81dbb3d79..0fbd9dfac 100644 --- a/roundcubemail/program/include/rcube_template.php +++ b/roundcubemail/program/include/rcube_template.php @@ -528,6 +528,7 @@ class rcube_template extends rcube_html_page { $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); } -- cgit v1.2.3