Changeset 19575 for trunk

Timestamp:

Dec 26, 2012, 12:35:40 PM (12 years ago)

Author:

mistic100

Message:

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

Location:

trunk

Files:

• include/smarty/libs/Smarty_Compiler.class.php (modified) (1 diff)
• themes/default/template/picture.tpl (modified) (1 diff)

trunk/include/smarty/libs/Smarty_Compiler.class.php

@@ -333 +333 @@
                 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 */

trunk/themes/default/template/picture.tpl

@@ -259 +259 @@
                                                 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} );