adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-03 08:22:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r11121 from branch 2.2 to trunk

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



git-svn-id: http://piwigo.org/svn/trunk@11122 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-05-30 22:24:45 +00:00
parent c594d3ac09
commit f650346a8d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/template.class.php
+1 -1
View File
@@ -1350,7 +1350,7 @@ final class FileCombiner
$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] != '/')
{
$relative = dirname($file) . "/$match[1]";
$search[] = $match[0];