aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-03-11 09:07:59 +0000
committerpatdenice <patdenice@piwigo.org>2011-03-11 09:07:59 +0000
commit92b8bb54a0744c4d1b8f793a9ea2ddc68689c8f0 (patch)
treec54d5fc858108719d308c10f0b60f84ff27d4181
parent3b08c1c689f471c5ad48db9c8e73245c9e30c4be (diff)
feature:2114
All combined scripts must end with ; to avoid javascript error. git-svn-id: http://piwigo.org/svn/trunk@9606 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/template.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/template.class.php b/include/template.class.php
index e2e7b8786..1536e8f7a 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -1318,7 +1318,7 @@ final class FileCombiner
require_once(PHPWG_ROOT_PATH.'include/jsmin.class.php');
try { $js = JSMin::minify($js); } catch(Exception $e) {}
}
- return $js;
+ return trim($js, " \t\r\n;").";\n";
}
private static function process_css($file)