From 7034bb713eb6ba53da4c13832de2e052c189dd61 Mon Sep 17 00:00:00 2001
From: Dave Longley <dlongley@digitalbazaar.com>
Date: Thu, 4 Apr 2013 11:25:46 -0400
Subject: [PATCH] Simplify expand IRI.

---
 jsonld.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/jsonld.php b/jsonld.php
index 28dcc95..8567889 100644
--- a/jsonld.php
+++ b/jsonld.php
@@ -4625,19 +4625,21 @@ class JsonLdProcessor {
 
       // do not expand blank nodes (prefix of '_') or already-absolute
       // IRIs (suffix of '//')
-      if($prefix !== '_' && strpos($suffix, '//') !== 0) {
-        // prefix dependency not defined, define it
-        if($local_ctx !== null && property_exists($local_ctx, $prefix)) {
-          $this->_createTermDefinition(
-            $active_ctx, $local_ctx, $prefix, $defined);
-        }
+      if($prefix === '_' || strpos($suffix, '//') === 0) {
+        return $value;
+      }
 
-        // use mapping if prefix is defined
-        if(property_exists($active_ctx->mappings, $prefix)) {
-          $mapping = $active_ctx->mappings->{$prefix};
-          if($mapping) {
-            return $mapping->{'@id'} . $suffix;
-          }
+      // prefix dependency not defined, define it
+      if($local_ctx !== null && property_exists($local_ctx, $prefix)) {
+        $this->_createTermDefinition(
+          $active_ctx, $local_ctx, $prefix, $defined);
+      }
+
+      // use mapping if prefix is defined
+      if(property_exists($active_ctx->mappings, $prefix)) {
+        $mapping = $active_ctx->mappings->{$prefix};
+        if($mapping) {
+          return $mapping->{'@id'} . $suffix;
         }
       }