From 7a933bdb5ad4a9bc4877a7d4d516fa0b21d9e4c0 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 12:25:54 +0100
Subject: [ticket/10328] Renamed the JSON class, also now using autoloading.

It is no longer static, and uses autoloading. It has also been renamed
from JSON to phpbb_json_response.

PHPBB3-10328
---
 phpBB/includes/json_response.php | 42 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 phpBB/includes/json_response.php

(limited to 'phpBB/includes/json_response.php')

diff --git a/phpBB/includes/json_response.php b/phpBB/includes/json_response.php
new file mode 100644
index 0000000000..95d02e3c0e
--- /dev/null
+++ b/phpBB/includes/json_response.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* JSON class
+* @package phpBB3
+*/
+class phpbb_json_response
+{
+	/**
+	 * Send the data to the client and exit the script.
+	 *
+	 * @param array $data Any additional data to send.
+	 * @param bool $exit Will exit the script if true.
+	 */
+	public function send($data, $exit = true)
+	{
+		header('Content-type: application/json');
+		echo json_encode($data);
+
+		if ($exit)
+		{
+			garbage_collection();
+			exit_handler();
+		}
+	}
+}
-- 
cgit v1.2.1


From dbb81fbd2bfadf52502f2200b0420953d98ffb56 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 24 Sep 2011 16:35:46 +0100
Subject: [ticket/10328] Added capital to "Content-type" in
 phpbb_json_response.

It was originally Content-type, but has been replaced with Content-Type,
which is correct.

PHPBB3-10328
---
 phpBB/includes/json_response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/json_response.php')

diff --git a/phpBB/includes/json_response.php b/phpBB/includes/json_response.php
index 95d02e3c0e..dfddea98f2 100644
--- a/phpBB/includes/json_response.php
+++ b/phpBB/includes/json_response.php
@@ -30,7 +30,7 @@ class phpbb_json_response
 	 */
 	public function send($data, $exit = true)
 	{
-		header('Content-type: application/json');
+		header('Content-Type: application/json');
 		echo json_encode($data);
 
 		if ($exit)
-- 
cgit v1.2.1


From e5d0f2c6ad5af0bf00303dfc15f4a11b1709eb4b Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 17 Nov 2011 17:13:35 +0000
Subject: [ticket/10328] Fixed the header of json_response.php.

PHPBB3-10328
---
 phpBB/includes/json_response.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes/json_response.php')

diff --git a/phpBB/includes/json_response.php b/phpBB/includes/json_response.php
index dfddea98f2..5dd904da09 100644
--- a/phpBB/includes/json_response.php
+++ b/phpBB/includes/json_response.php
@@ -2,8 +2,7 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
-- 
cgit v1.2.1