archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

local css prefilter does not need new line before get_combined_css

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@28600 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2014-06-02 19:57:30 +00:00
commit 0fe08001c3
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/template.class.php
View file

@ -592,7 +592,7 @@ class Template
/**
* "translate" variable modifier.
* Usage :
* Usage :
* - {'Comment'|translate}
* - {'%d comments'|translate:$count}
* @see l10n()
@ -1101,7 +1101,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
if (!empty($css))
{
$source = str_replace("\n{get_combined_css}", "\n".implode( "\n", $css )."\n{get_combined_css}", $source);
$source = str_replace("{get_combined_css}", implode( "\n", $css )."\n{get_combined_css}", $source);
}
return $source;
@ -1164,7 +1164,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$buttons = array_merge($buttons, $row);
}
$this->assign('PLUGIN_PICTURE_BUTTONS', $buttons);
// only for PHP 5.3
// $this->assign('PLUGIN_PICTURE_BUTTONS',
// array_reduce(
@ -1189,7 +1189,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$buttons = array_merge($buttons, $row);
}
$this->assign('PLUGIN_INDEX_BUTTONS', $buttons);
// only for PHP 5.3
// $this->assign('PLUGIN_INDEX_BUTTONS',
// array_reduce(
@ -1359,18 +1359,18 @@ class CssLoader
private $registered_css;
/** @param int used to keep declaration order */
private $counter;
function __construct()
{
$this->clear();
}
function clear()
{
$this->registered_css = array();
$this->counter = 0;
}
/**
* @return Combinable[] array of combined CSS.
*/
@ -1380,7 +1380,7 @@ class CssLoader
$combiner = new FileCombiner('css', $this->registered_css);
return $combiner->combine();
}
/**
* Callback for CSS files sorting.
*/
@ -1388,7 +1388,7 @@ class CssLoader
{
return $a->order - $b->order;
}
/**
* Adds a new file, if a file with the same $id already exsists, the one with
* the higher $order or higher $version is kept.