From ceb9afbb5d69024f33ffa909c36c899f280bea85 Mon Sep 17 00:00:00 2001
From: uwetews <uwe.tews@googlemail.com>
Date: Tue, 15 Sep 2015 00:18:17 +0200
Subject: [PATCH] - bugfix unintended multiple debug windows (forum topic
 25699)

---
 change_log.txt                            |  1 +
 libs/Smarty.class.php                     |  2 +-
 libs/debug.tpl                            |  2 +-
 libs/sysplugins/smarty_internal_debug.php | 24 ++++++++++++-----------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index 17652fc2..c5bc5173 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -5,6 +5,7 @@
   - update template inheritance processing
   - move code of {call} processing back into Smarty_Internal_Template class
   - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557)
+  - bugfix unintended multiple debug windows (forum topic 25699)
   
  30.08.2015
   - size optimization move some runtime functions into extension
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 586d1ed6..c77d7c5e 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -119,7 +119,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.28-dev/59';
+    const SMARTY_VERSION = '3.1.28-dev/60';
 
     /**
      * define variable scopes
diff --git a/libs/debug.tpl b/libs/debug.tpl
index 1f77ac62..5526cbca 100644
--- a/libs/debug.tpl
+++ b/libs/debug.tpl
@@ -152,7 +152,7 @@
     </html>
 {/capture}
 <script type="text/javascript">
-    {$id = ''}
+    {$id = '__Smarty__'}
     {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
     _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}");
diff --git a/libs/sysplugins/smarty_internal_debug.php b/libs/sysplugins/smarty_internal_debug.php
index b63039c2..e330a35c 100644
--- a/libs/sysplugins/smarty_internal_debug.php
+++ b/libs/sysplugins/smarty_internal_debug.php
@@ -43,16 +43,12 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
      * @var int
      */
     public $offset = 0;
-    
-    public function __construct() {
-    
-}
 
     /**
      * Start logging template
      *
      * @param \Smarty_Internal_Template $template template
-     * @param null                                $mode true: display   false: fetch  null: subtemolate
+     * @param null                      $mode     true: display   false: fetch  null: subtemplate
      */
     public function start_template(Smarty_Internal_Template $template, $mode = null)
     {
@@ -73,7 +69,8 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     public function end_template(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[$this->index][$key]['total_time'] += microtime(true) - $this->template_data[$this->index][$key]['start_template_time'];
+        $this->template_data[$this->index][$key]['total_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_template_time'];
         //$this->template_data[$this->index][$key]['properties'] = $template->properties;
     }
 
@@ -89,7 +86,8 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
             $key = $template->compiler->trace_uid;
             if (!isset($this->template_data[$this->index][$key])) {
                 if (isset($_is_stringy[$template->source->type])) {
-                    $this->template_data[$this->index][$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
+                    $this->template_data[$this->index][$key]['name'] =
+                        '\'' . substr($template->source->name, 0, 25) . '...\'';
                 } else {
                     $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
                 }
@@ -122,7 +120,8 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
 
             $key = $this->get_key($template);
         }
-        $this->template_data[$this->index][$key]['compile_time'] += microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+        $this->template_data[$this->index][$key]['compile_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -144,7 +143,8 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     public function end_render(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[$this->index][$key]['render_time'] += microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+        $this->template_data[$this->index][$key]['render_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -166,7 +166,8 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     public function end_cache(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[$this->index][$key]['cache_time'] += microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+        $this->template_data[$this->index][$key]['cache_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -367,7 +368,8 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
             return $key;
         } else {
             if (isset($_is_stringy[$template->source->type])) {
-                $this->template_data[$this->index][$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
+                $this->template_data[$this->index][$key]['name'] =
+                    '\'' . substr($template->source->name, 0, 25) . '...\'';
             } else {
                 $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
             }