aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-05-30 22:24:45 +0000
committerplegall <plg@piwigo.org>2011-05-30 22:24:45 +0000
commitf650346a8def3fb9bd75ef103841c700215d6580 (patch)
tree7f126f8cc595c37ada2d5c23463b2bc398624a19 /include
parentc594d3ac095a24373dcdcf34bcdff63f4540f165 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/template.class.php2
1 files changed, 1 insertions, 1 deletions
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];