tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed JSON.php include path in Convert.php

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60412 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-08-11 06:27:53 +00:00
parent 970cba1b5d
commit b795186d0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Convert.php
View File

@ -82,7 +82,7 @@ class Convert extends Object {
if(function_exists('json_encode')) { if(function_exists('json_encode')) {
return json_encode($val); return json_encode($val);
} else { } else {
require_once(Director::baseFolder() . '/sapphire/misc/json/JSON.php'); require_once(Director::baseFolder() . '/sapphire/thirdparty/json/JSON.php');
$json = new Services_JSON(); $json = new Services_JSON();
return $json->encode($val); return $json->encode($val);
} }
@ -165,7 +165,7 @@ class Convert extends Object {
//if(function_exists('json_decode')) { //if(function_exists('json_decode')) {
// return json_decode($val); // return json_decode($val);
//} else { //} else {
require_once(Director::baseFolder() . '/sapphire/misc/json/JSON.php'); require_once(Director::baseFolder() . '/sapphire/thirdparty/json/JSON.php');
$json = new Services_JSON(); $json = new Services_JSON();
return $json->decode($val); return $json->decode($val);
//} //}