adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 17:23:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2816: {strip} smarty tag can introduce bugs in javascript + fix picture.tpl

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@19575 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2012-12-26 11:35:40 +00:00
parent 8188973b0c
commit 9cc816d364
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/smarty/libs/Smarty_Compiler.class.php
+1 -1
View File
@@ -332,7 +332,7 @@ class Smarty_Compiler extends Smarty {
/* strip all $text_blocks before the next '/strip' */
for ($j = $i + 1; $j < $for_max; $j++) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', ' ', $text_blocks[$j]);
if ($compiled_tags[$j] == '{/strip}') {
/* remove trailing whitespaces from the last text_block */
$text_blocks[$j] = rtrim($text_blocks[$j]);
themes/default/template/picture.tpl
+3 -2
View File
@@ -258,10 +258,11 @@ y.callService(
if (e) e.innerHTML = rating.score;
e = document.getElementById("ratingCount");
if (e) {ldelim}
if (rating.count == 1)
if (rating.count == 1) {
e.innerHTML = "({'%d rate'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
else
} else {
e.innerHTML = "({'%d rates'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
}
{rdelim}
{rdelim}{rdelim} );
{/footer_script}