aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2013-11-12 21:43:50 +0000
committerrvelices <rv-github@modusoptimus.com>2013-11-12 21:43:50 +0000
commit53ac8a878e8ec201ef8105e12e0d70729a94ff4f (patch)
tree704f084b5dcadc90c7896aa8c763ae6a87858248
parent6f1b9ab90457bb28e084bda753fa1db2b3366775 (diff)
bug 2963: Ability to create css/js smarty templates - fixes again
git-svn-id: http://piwigo.org/svn/trunk@25471 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/template.class.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/template.class.php b/include/template.class.php
index deef61af5..a3f4674ae 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -1373,7 +1373,10 @@ final class FileCombiner
{
$this->flush_pending($result, $pending, $key, $force);
$key = $this->is_css ? array(get_absolute_root_url(false)): array(); //because for css we modify bg url
- $pending = array($combinable);
+ if ($combinable->is_remote())
+ $result[] = $combinable;
+ else
+ $pending = array($combinable);
}
}
$this->flush_pending($result, $pending, $key, $force);