From 07866088243c7aec025c51d605a2c1adfe93f407 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Sat, 25 Dec 2010 12:15:46 +0000
Subject: - 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
---
 include/template.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'include')

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
-- 
cgit v1.2.3