friendica/php-json-ld
4
1
Fork 2
Code Issues Pull requests Releases 5 Activity

Updated to pass tests.

Browse source
This commit is contained in:
Dave Longley 2011-08-06 23:24:17 -04:00
parent 210b77ea5e
commit be88eaa0c4
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
jsonld.php
View file

@ -1315,21 +1315,25 @@ function _flatten($parent, $parentProperty, $value, $subjects)
// drop null values // drop null values
if($v !== null) if($v !== null)
{ {
if(is_array($v)) if(property_exists($subject, $key))
{ {
$subject->$key = new ArrayObject(); if(!is_array($subject->$key))
_flatten($subject->$key, null, $value->$key, $subjects);
$subject->$key = (array)$subject->$key;
if(count($subject->$key) === 1)
{ {
// convert subject[key] to object if it has only 1 $subject->$key = new ArrayObject(array($subject->$key));
$arr = $subject->$key;
$subject->$key = $arr[0];
} }
} }
else else
{ {
_flatten($subject, $key, $value->$key, $subjects); $subject->$key = new ArrayObject();
}
_flatten($subject->$key, null, $value->$key, $subjects);
$subject->$key = (array)$subject->$key;
if(count($subject->$key) === 1)
{
// convert subject[key] to object if it has only 1
$arr = $subject->$key;
$subject->$key = $arr[0];
} }
} }
} }