Changeset f6a7491 in github

Timestamp:

Jan 27, 2012 11:52:21 AM (16 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

3c71c67

Parents:

77c779a

Message:

Fix special vars replacement in templates

Location:

program/include

Files:

• rcube_html_page.php (modified) (1 diff)
• rcube_template.php (modified) (1 diff)

program/include/rcube_html_page.php

@@ -285 +285 @@
             '!(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

program/include/rcube_template.php

@@ -529 +529 @@
         $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);