From: shaununderwood <shaununderwood@users.noreply.github.com>
Date: Sun, 23 Oct 2016 19:23:38 +0000 (+0100)
Subject: Changed 'undefined' to 'null'
X-Git-Tag: v4.3.0~68
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=3a1c2510653a70f6b5d23b37127a770a908c461f;p=adminer.git

Changed 'undefined' to 'null'

'undefined' is not a valid JSON attribute value and should been 'null'
---

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index e7bdb162..8b97138d 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -243,7 +243,7 @@ function json_row($key, $val = null) {
 		echo "{";
 	}
 	if ($key != "") {
-		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'undefined');
+		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
 		$first = false;
 	} else {
 		echo "\n}\n";