Changeset 11122

Timestamp:

05/31/11 00:24:45 (2 years ago)

Author:

plg

Message:

merge r11121 from branch 2.2 to trunk

bug 2316 fixed: remote urls on local CSS files should not be modified

Files:

• trunk/include/template.class.php (modified) (1 diff)

trunk/include/template.class.php

@@ -1351 +1351 @@
       foreach ($matches as $match)
       {
-        if ( !url_is_remote($match[1]) || $match[1][0] != '/')
+        if ( !url_is_remote($match[1]) && $match[1][0] != '/')
         {
           $relative = dirname($file) . "/$match[1]";