iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 2963: Ability to create css/js smarty templates - fixes

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@25464 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2013-11-12 20:30:35 +00:00
parent 2eb4059d58
commit 18d9bff158
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/template.class.php
View File

@@ -1372,9 +1372,8 @@ final class FileCombiner
else
{
$this->flush_pending($result, $pending, $key, $force);
$pending = array();
$key = $this->is_css ? array(get_absolute_root_url(false)): array(); //because for css we modify bg url
$result[] = $combinable;
$pending = array($combinable);
}
}
$this->flush_pending($result, $pending, $key, $force);
@@ -1413,6 +1412,7 @@ final class FileCombiner
private function process_combinable($combinable, $return_content, $force)
{
global $conf;
if ($combinable->is_template)
{
if (!$return_content)
@@ -1420,7 +1420,7 @@ final class FileCombiner
$key = array($combinable->path, $combinable->version);
if ($conf['template_compile_check'])
$key[] = filemtime( PHPWG_ROOT_PATH . $combinable->path );
$file = PWG_COMBINED_DIR . 't' . base_convert(crc32($key),10,36) . '.' . $this->type;
$file = PWG_COMBINED_DIR . 't' . base_convert(crc32(implode(',',$key)),10,36) . '.' . $this->type;
if (!$force && file_exists(PHPWG_ROOT_PATH.$file) )
{
$combinable->path = $file;