Changeset 25800 for trunk/include/template.class.php

Timestamp:

Dec 6, 2013, 6:18:19 PM (11 years ago)

Author:

mistic100

Message:

FileCombiner does not try to change url of images embedded in base64

File:

• trunk/include/template.class.php (modified) (2 diffs)

trunk/include/template.class.php

@@ -1538 +1538 @@
   private static function process_css_rec($css, $dir)
   {
-    static $PATTERN = "#url\(\s*['|\"]{0,1}(.*?)['|\"]{0,1}\s*\)#";
-
-    if (preg_match_all($PATTERN, $css, $matches, PREG_SET_ORDER))
+    static $PATTERN_URL = "#url\(\s*['|\"]{0,1}(.*?)['|\"]{0,1}\s*\)#";
+    static $PATTERN_IMPORT = "#@import\s*['|\"]{0,1}(.*?)['|\"]{0,1};#";
+
+    if (preg_match_all($PATTERN_URL, $css, $matches, PREG_SET_ORDER))
     {
       $search = $replace = array();
       foreach ($matches as $match)
       {
-        if ( !url_is_remote($match[1]) && $match[1][0] != '/')
+        if ( !url_is_remote($match[1]) && $match[1][0] != '/' && strpos($match[1], 'data:image/')===false)
         {
           $relative = $dir . "/$match[1]";
@@ -1555 +1556 @@
     }
 
-    $imports = preg_match_all("#@import\s*['|\"]{0,1}(.*?)['|\"]{0,1};#", $css, $matches, PREG_SET_ORDER);
-    if ($imports)
+    if (preg_match_all($PATTERN_IMPORT, $css, $matches, PREG_SET_ORDER))
     {
       $search = $replace = array();