From d50dca8ab3eaead63e52fde66219942dd0ee60a3 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 10 Jun 2014 17:30:21 +0000
Subject: [PATCH] Add JSON encoder utility to Format class
---
include/class.ajax.php | 4 +---
include/class.format.php | 9 +++++++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/include/class.ajax.php b/include/class.ajax.php
index c852a5517..3be9713d8 100644
--- a/include/class.ajax.php
+++ b/include/class.ajax.php
@@ -38,9 +38,7 @@ class AjaxController extends ApiController {
* Convert a PHP array into a JSON-encoded string
*/
function json_encode($what) {
- require_once (INCLUDE_DIR.'class.json.php');
- $encoder = new JsonDataEncoder();
- return $encoder->encode($what);
+ return Format::json_encode($what);
}
function encode($what) {
diff --git a/include/class.format.php b/include/class.format.php
index 3b841a4a5..4c73d5188 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -99,6 +99,15 @@ class Format {
return $filename;
}
+ /**
+ * Json Encoder
+ *
+ */
+ function json_encode($what) {
+ require_once (INCLUDE_DIR.'class.json.php');
+ return JsonDataEncoder::encode($what);
+ }
+
function phone($phone) {
$stripped= preg_replace("/[^0-9]/", "", $phone);
--
GitLab