Changeset 11122


Ignore:
Timestamp:
05/31/11 00:24:45 (8 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/template.class.php

    r10656 r11122  
    13511351      foreach ($matches as $match) 
    13521352      { 
    1353         if ( !url_is_remote($match[1]) || $match[1][0] != '/') 
     1353        if ( !url_is_remote($match[1]) && $match[1][0] != '/') 
    13541354        { 
    13551355          $relative = dirname($file) . "/$match[1]"; 
Note: See TracChangeset for help on using the changeset viewer.