Changeset 1330 in subversion

Timestamp:

Apr 23, 2008 3:33:59 PM (5 years ago)

Author:

alec

Message:

• Append skin_path to images location only when it starts with '/' sign (#1484859)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_template.php (modified) (4 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/04/23 (alec)
+----------
+- Append skin_path to images location only when it starts 
+  with '/' sign (#1484859)
 
 2008/04/20 (estadtherr)

trunk/roundcubemail/program/include/rcube_template.php

@@ -600 +600 @@
     }
 
-
     /**
      * Create and register a button
@@ -618 +617 @@
         $a_static_commands = array('compose', 'list');
 
-        $browser   = new rcube_browser();
-        $skin_path = $this->config['skin_path'];
-
         if (!($attrib['command'] || $attrib['name'])) {
             return '';
         }
+
+        $browser   = new rcube_browser();
+
         // try to find out the button type
         if ($attrib['type']) {
@@ -688 +687 @@
                 $attrib['id'],
                 $attrib['type'],
-                $attrib['imageact'] ? $skin_path.$attrib['imageact'] : $attrib['classact'],
-                $attrib['imagesel'] ? $skin_path.$attrib['imagesel'] : $attrib['classsel'],
-                $attrib['imageover'] ? $skin_path.$attrib['imageover'] : ''
+                $attrib['imageact'] ? $this->abs_url($attrib['imageact']) : $attrib['classact'],
+                $attrib['imagesel'] ? $this->abs_url($attrib['imagesel']) : $attrib['classsel'],
+                $attrib['imageover'] ? $this->abs_url($attrib['imageover']) : ''
             ));
 
@@ -756 +755 @@
                 )
             );
-            $img_tag = sprintf('<img src="%%s"%s />', $attrib_str);
-            $btn_content = sprintf($img_tag, $skin_path.$attrib['image']);
+            $btn_content = sprintf('<img src="%s"%s />', $this->abs_url($attrib['image']), $attrib_str);
             if ($attrib['label']) {
                 $btn_content .= ' '.$attrib['label'];