diff options
| author | mistic100 <mistic@piwigo.org> | 2012-12-26 11:35:40 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2012-12-26 11:35:40 +0000 |
| commit | 9cc816d364057828cecc26dc1432448a57f261e9 (patch) | |
| tree | 9987060f41c7278e8b0ed80cf45d52dadc4bd323 | |
| parent | 8188973b0c87e7b8568325c603379239d2375ab0 (diff) | |
feature 2816: {strip} smarty tag can introduce bugs in javascript + fix picture.tpl
git-svn-id: http://piwigo.org/svn/trunk@19575 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/smarty/libs/Smarty_Compiler.class.php | 2 | ||||
| -rw-r--r-- | themes/default/template/picture.tpl | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/smarty/libs/Smarty_Compiler.class.php b/include/smarty/libs/Smarty_Compiler.class.php index 1178b84d0..62a467bea 100644 --- a/include/smarty/libs/Smarty_Compiler.class.php +++ b/include/smarty/libs/Smarty_Compiler.class.php @@ -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]); diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 7713c7555..c75a60305 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -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} |