From f650346a8def3fb9bd75ef103841c700215d6580 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 30 May 2011 22:24:45 +0000 Subject: merge r11121 from branch 2.2 to trunk 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 --- include/template.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/template.class.php') diff --git a/include/template.class.php b/include/template.class.php index 5a79bbfb6..4eef7dab0 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -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]; -- cgit v1.2.3