From b795186d0ab406c3dbe7d2e82653636ef7c570ea Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 11 Aug 2008 06:27:53 +0000 Subject: [PATCH] BUGFIX Fixed JSON.php include path in Convert.php git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60412 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Convert.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Convert.php b/core/Convert.php index a4d9ee93c..32928740b 100755 --- a/core/Convert.php +++ b/core/Convert.php @@ -82,7 +82,7 @@ class Convert extends Object { if(function_exists('json_encode')) { return json_encode($val); } else { - require_once(Director::baseFolder() . '/sapphire/misc/json/JSON.php'); + require_once(Director::baseFolder() . '/sapphire/thirdparty/json/JSON.php'); $json = new Services_JSON(); return $json->encode($val); } @@ -165,7 +165,7 @@ class Convert extends Object { //if(function_exists('json_decode')) { // return json_decode($val); //} else { - require_once(Director::baseFolder() . '/sapphire/misc/json/JSON.php'); + require_once(Director::baseFolder() . '/sapphire/thirdparty/json/JSON.php'); $json = new Services_JSON(); return $json->decode($val); //}