diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-12-25 12:15:46 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-12-25 12:15:46 +0000 |
| commit | 07866088243c7aec025c51d605a2c1adfe93f407 (patch) | |
| tree | da2fdb0cd17af459dc4845583bc50a7833a1b40d /include/template.class.php | |
| parent | 2f90ae92512d409e275d786177649c50af5d6e18 (diff) | |
- 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
Diffstat (limited to 'include/template.class.php')
| -rw-r--r-- | include/template.class.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/template.class.php b/include/template.class.php index 529601a6a..2e62d3d94 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -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 |