From d332870bef7d6b246a716cc48db1d468f361be79 Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Mon, 29 Feb 2016 10:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=BC=95=E8=B5=B7=E8=87=B4=E5=91=BD=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tpl/think_exception.tpl | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tpl/think_exception.tpl b/tpl/think_exception.tpl
index f63e5fad..f1f420e8 100644
--- a/tpl/think_exception.tpl
+++ b/tpl/think_exception.tpl
@@ -177,13 +177,13 @@
             </div>
         </h1>
         <div class="source-code">
-            <pre class="prettyprint lang-php"><ol start="<?php echo $source['first']; ?>"><?php foreach ($source['source'] as $key => $value) { ?><li class="line-<?php echo $key + $source['first']; ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre>
+            <pre class="prettyprint lang-php"><ol start="<?php echo $source['first']; ?>"><?php foreach ((array) $source['source'] as $key => $value) { ?><li class="line-<?php echo $key + $source['first']; ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre>
         </div>
         <div class="trace">
             <h3>Call Stack</h3>
             <ol>
                 <li><?php echo sprintf('in %s', parse_file($file, $line)); ?></li>
-                <?php foreach ($trace as $value) { ?>
+                <?php foreach ((array) $trace as $value) { ?>
                 <li>
                 <?php 
                     // Show Function
@@ -211,14 +211,14 @@
     <?php if(!empty($datas)){ ?>
     <div class="exception-var">
         <h2>Exception Datas</h2>
-        <?php foreach ($datas as $label => $value) { ?>
+        <?php foreach ((array) $datas as $label => $value) { ?>
         <table>
             <?php if(empty($value)){ ?>
             <caption><?php echo $label; ?><small>empty</small></caption>
             <?php } else { ?>
             <caption><?php echo $label; ?></caption>
             <tbody>
-                <?php foreach ($value as $key => $val) { ?>
+                <?php foreach ((array) $value as $key => $val) { ?>
                 <tr>
                     <td><?php echo htmlentities($key); ?></td>
                     <td>
@@ -243,14 +243,14 @@
 
     <div class="exception-var">
         <h2>Environment Variables</h2>
-        <?php foreach ($tables as $label => $value) { ?>
+        <?php foreach ((array) $tables as $label => $value) { ?>
         <table>
             <?php if(empty($value)){ ?>
             <caption><?php echo $label; ?><small>empty</small></caption>
             <?php } else { ?>
             <caption><?php echo $label; ?></caption>
             <tbody>
-                <?php foreach ($value as $key => $val) { ?>
+                <?php foreach ((array) $value as $key => $val) { ?>
                 <tr>
                     <td><?php echo htmlentities($key); ?></td>
                     <td>
@@ -369,23 +369,27 @@
 </body>
 </html>
 <?php
+if (!function_exists('parse_padding')) {
     function parse_padding($source)
     {
         $length  = strlen(strval(count($source['source']) + $source['first']));
         return 40 + ($length - 1) * 8;
     }
-
+}
+if (!function_exists('parse_class')) {
     function parse_class($name)
     {
         $names = explode('\\', $name);
         return '<abbr title="'.$name.'">'.end($names).'</abbr>';
     }
-
+}
+if (!function_exists('parse_file')) {
     function parse_file($file, $line)
     {
         return '<a class="toggle" title="'."{$file} line {$line}".'">'.basename($file)." line {$line}".'</a>';
     }
-
+}
+if (!function_exists('parse_args')) {
     function parse_args($args)
     {
         $result = [];
@@ -436,3 +440,4 @@
 
         return implode(', ', $result);
     }
+}
\ No newline at end of file