From e5bea506afc5c185474367eb06a336ac48d7b99a Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Wed, 1 Jul 2015 10:54:45 +0200
Subject: [PATCH] - bugfix debugging console did not display string values
 containing \n, \r or \t correctly
 https://github.com/smarty-php/smarty/issues/66

---
 change_log.txt                            | 1 +
 libs/Smarty.class.php                     | 2 +-
 libs/debug.tpl                            | 6 +++---
 libs/plugins/modifier.debug_print_var.php | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index 384f6215..65a3f950 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -2,6 +2,7 @@
  01.07.2015
   - optimize compile check handling
   - update {foreach} compiler
+  - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66
 
  28.06.2015
   - move $smarty->enableSecurity() into Smarty_Security class
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index c2a71bd1..d5293133 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.28-dev/20';
+    const SMARTY_VERSION = '3.1.28-dev/21';
 
     /**
      * define variable scopes
diff --git a/libs/debug.tpl b/libs/debug.tpl
index 5b09c5bd..1f77ac62 100644
--- a/libs/debug.tpl
+++ b/libs/debug.tpl
@@ -128,7 +128,7 @@
             <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
                 <td><h3><font color=blue>${$vars@key}</font></h3>
                     {if isset($vars['nocache'])}<b>Nocache</b></br>{/if}
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var:10:80 nofilter}{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
                 </td>
                 <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
                 <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
@@ -141,7 +141,7 @@
         {foreach $config_vars as $vars}
             <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
                 <td><h3><font color=blue>#{$vars@key}#</font></h3>
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var:10:80 nofilter}{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
                 </td>
                 <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
             </tr>
@@ -154,7 +154,7 @@
 <script type="text/javascript">
     {$id = ''}
     {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
-    _smarty_console = window.open("", "console{$id}", "width=680,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
+    _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
     _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
     _smarty_console.document.close();
 </script>
diff --git a/libs/plugins/modifier.debug_print_var.php b/libs/plugins/modifier.debug_print_var.php
index e3971a04..4ff8213c 100644
--- a/libs/plugins/modifier.debug_print_var.php
+++ b/libs/plugins/modifier.debug_print_var.php
@@ -24,9 +24,9 @@
  */
 function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
 {
-    $_replace = array("\n" => '<i>\n</i>',
-                      "\r" => '<i>\r</i>',
-                      "\t" => '<i>\t</i>'
+    $_replace = array("\n" => '\n',
+                      "\r" => '\r',
+                      "\t" => '\t'
     );
     switch (gettype($var)) {
         case 'array' :