nupplaPhil/php-json-ld
1
0
Fork 0
forked from friendica/php-json-ld
Code Pull requests Activity

Support strings passed into processContext.

Browse source
This commit is contained in:
Dave Longley 2013-04-04 02:54:16 -04:00
commit c765930a43
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
jsonld.php
View file

@ -1,7 +1,7 @@
<?php <?php
/** /**
* PHP implementation of the JSON-LD API. * PHP implementation of the JSON-LD API.
* Version: 0.0.23 * Version: 0.0.24
* *
* @author Dave Longley * @author Dave Longley
* *
@ -1072,13 +1072,14 @@ class JsonLdProcessor {
} }
// retrieve URLs in local_ctx // retrieve URLs in local_ctx
$ctx = self::copy($local_ctx); $local_ctx = self::copy($local_ctx);
if(is_object($ctx) && !property_exists($ctx, '@context')) { if(is_string($local_ctx) or (
$ctx = (object)array('@context' => $ctx); is_object($local_ctx) && !property_exists($local_ctx, '@context'))) {
$local_ctx = (object)array('@context' => $local_ctx);
} }
try { try {
$this->_retrieveContextUrls( $this->_retrieveContextUrls(
$ctx, new stdClass(), $options['loadContext'], $options['base']); $local_ctx, new stdClass(), $options['loadContext'], $options['base']);
} }
catch(Exception $e) { catch(Exception $e) {
throw new JsonLdException( throw new JsonLdException(
@ -1087,7 +1088,7 @@ class JsonLdProcessor {
} }
// process context // process context
return $this->_processContext($active_ctx, $ctx, $options); return $this->_processContext($active_ctx, $local_ctx, $options);
} }
/** /**