Changeset 2519 in subversion

Timestamp:

May 22, 2009 3:59:37 AM (4 years ago)

Author:

thomasb

Message:

Fix URLs to plugin skin directory

File:

• trunk/roundcubemail/program/include/rcube_template.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_template.php

@@ -339 +339 @@
             $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->config['plugins_dir'] . '/' . $skin_dir;
+            if (!is_dir($skin_path)) {  // fallback to default skin
+                $skin_dir = $plugin . '/skins/default';
+                $skin_path = $this->config['plugins_dir'] . '/' . $skin_dir;
+            }
         }
         
@@ -361 +364 @@
         // 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);
         }