aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-05-30 22:22:47 +0000
committerplegall <plg@piwigo.org>2011-05-30 22:22:47 +0000
commit47f31c2c90bfe4637266342cbcbd143eb93fac05 (patch)
tree285f7be8c1cb7317a01c25ce3069bd9db21d6206 /include
parentf965acce88683ebd1fdf8f50dd1a8d342af858e9 (diff)
bug 2316 fixed: remote urls on local CSS files should not be modified
git-svn-id: http://piwigo.org/svn/branches/2.2@11121 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];