From 43bc68c732338be2e82c5c516f20704e12d82a7c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 4 Feb 2015 17:58:01 +0100
Subject: Finish config module editing

---
 inc/up_json_encode.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'inc/up_json_encode.php')

diff --git a/inc/up_json_encode.php b/inc/up_json_encode.php
index 28556923..c33cb012 100644
--- a/inc/up_json_encode.php
+++ b/inc/up_json_encode.php
@@ -1,5 +1,10 @@
 <?php
 
+if (defined('JSON_PRETTY_PRINT'))
+	define('JSON_NATIVE', true);
+else
+	define('JSON_NATIVE', false);
+
 /**
  * api:		php
  * title:	upgrade.php
@@ -78,6 +83,8 @@ if (!defined("JSON_UNESCAPED_SLASHES")) {
 
 function up_json_encode($var, $options = 0, $_indent = "")
 {
+	if (defined('JSON_NATIVE') && JSON_NATIVE)
+		return json_encode($var, $options);
 	global ${'.json_last_error'};
 	${'.json_last_error'} = JSON_ERROR_NONE;
 
-- 
cgit v1.2.3-55-g7522