From 61ac93948e09b427eebb48572bbed9cd179d0b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E5=B0=8F=E9=9B=A8?= <614422099@QQ.com>
Date: Mon, 13 Jun 2016 15:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DjsonEncode=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将字符串拼装的方法重命名为:json_encode
---
 .../Library/Behavior/FireShowPageTraceBehavior.class.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ThinkPHP/Library/Behavior/FireShowPageTraceBehavior.class.php b/ThinkPHP/Library/Behavior/FireShowPageTraceBehavior.class.php
index 0fbd2c4d2..cdfc84210 100644
--- a/ThinkPHP/Library/Behavior/FireShowPageTraceBehavior.class.php
+++ b/ThinkPHP/Library/Behavior/FireShowPageTraceBehavior.class.php
@@ -1515,9 +1515,9 @@ public function jsonEncode($Object, $skipObjectEncode = false)
         if (function_exists('json_encode')
             && false != $this->options['useNativeJsonEncode']) {
 
-            return jsonEncode($Object);
+            return json_encode($Object);
         } else {
-            return $this->jsonEncode($Object);
+            return $this->json_encode($Object);
         }
     }
 
@@ -1865,7 +1865,7 @@ private function jsonUtf82utf16($utf8)
      * @return   mixed   JSON string representation of input var or an error if a problem occurs
      * @access   public
      */
-    private function jsonEncode($var)
+    private function json_encode($var)
     {
 
         if (is_object($var)) {