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

BUGFIX Fixed Convert::json2array() from dying if Convert::json2obj() returns false

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77428 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-20 22:52:33 +00:00
parent 2a66b5a8e1
commit 310a85cd9e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/Convert.php
View File

@ -155,14 +155,21 @@ class Convert extends Object {
} }
/** /**
* Convert a JSON string into an array.
*
* @uses json2obj * @uses json2obj
* @param string $val JSON string to convert
* @return array|boolean
*/ */
static function json2array($val) { static function json2array($val) {
$json = self::json2obj($val); $json = self::json2obj($val);
if(!$json) return false;
$arr = array(); $arr = array();
foreach($json as $k => $v) { foreach($json as $k => $v) {
$arr[$k] = $v; $arr[$k] = $v;
} }
return $arr; return $arr;
} }