- simplified inneficient css rules

- template language key
- group picture scripts on the bottom of the page


git-svn-id: http://piwigo.org/svn/trunk@8299 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2010-12-25 12:15:46 +00:00
commit 0786608824
4 changed files with 32 additions and 32 deletions

View file

@ -596,9 +596,10 @@ class Template {
}
if (count($this->scriptLoader->inline_scripts))
{
$content[]= '<script type="text/javascript">';
$content[]= '<script type="text/javascript">//<![CDATA[
';
$content = array_merge($content, $this->scriptLoader->inline_scripts);
$content[]= '</script>';
$content[]= '//]]></script>';
}
if (count($scripts[1]))
@ -1170,7 +1171,7 @@ final class FileCombiner
$is_reload =
(isset($_SERVER['HTTP_CACHE_CONTROL']) && strpos($_SERVER['HTTP_CACHE_CONTROL'], 'max-age=0') !== false)
|| (isset($_SERVER['HTTP_PRAGMA']) && strpos($_SERVER['HTTP_PRAGMA'], 'no-cache'));
if ($is_reload)
if (is_admin() && $is_reload)
{// the user pressed F5 in the browser
if ($is_css || $conf['template_compile_check']==false)
$exists = false; // we foce regeneration of css because @import sub-files are never checked for modification