MrPetovan/php-json-ld
1
0
Fork 0
forked from friendica/php-json-ld
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixes to pass property CURIE conflict during compact.

Browse source
This commit is contained in:
Dave Longley 2011-07-29 16:02:58 -04:00
parent 25c62ddac1
commit dbd83f1535
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
jsonld.php
View file

@ -690,7 +690,9 @@ function _compact($ctx, $property, $value, $usedCtx)
if($value === null) if($value === null)
{ {
// return null, but check coerce type to add to usedCtx
$rval = null; $rval = null;
_getCoerceType($ctx, $property, $usedCtx);
} }
else if(is_array($value)) else if(is_array($value))
{ {
@ -721,10 +723,13 @@ function _compact($ctx, $property, $value, $usedCtx)
{ {
if($v !== '@context') if($v !== '@context')
{ {
// set object to compacted property // set object to compacted property, only overwrite existing
_setProperty( // properties if the property actually compacted
$rval, _compactIri($ctx, $key, $usedCtx), $p = _compactIri($ctx, $key, $usedCtx);
_compact($ctx, $key, $v, $usedCtx)); if($p !== $key or !property_exists($rval, $p))
{
$rval->$p = _compact($ctx, $key, $v, $usedCtx);
}
} }
} }
} }