From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 12 Jul 2013 18:12:57 +0000 (-0700)
Subject: Allow using json_row() in HTML
X-Git-Tag: v4.0.0~126
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=be6b7c6caccd0e53ac7befe67a4be056b98cd060;p=adminer.git

Allow using json_row() in HTML
---

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 6077b056..74e96f4a 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -220,7 +220,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\"\\/") . '"' : 'undefined');
 		$first = false;
 	} else {
 		echo "\n}\n";