Skip to content
This repository has been archived by the owner on Jan 4, 2020. It is now read-only.

修复jsonEncode冲突 #441

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复jsonEncode冲突 #441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ThinkPHP/Library/Behavior/FireShowPageTraceBehavior.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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)) {
Expand Down