From 25c62ddac10eefd195b9a2b22f6392f85ddd8cc2 Mon Sep 17 00:00:00 2001
From: Dave Longley <dlongley@digitalbazaar.com>
Date: Fri, 29 Jul 2011 15:34:43 -0400
Subject: [PATCH] Simplified framing default option handling.

---
 jsonld.php | 40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/jsonld.php b/jsonld.php
index 87b5abb..11152f4 100644
--- a/jsonld.php
+++ b/jsonld.php
@@ -2636,12 +2636,12 @@ function _frame($subjects, $input, $frame, $embeds, $options)
                   }
                   else
                   {
-                     // add null property to value
-                     $value->$key = null;
+                     // add empty array/null property to value
+                     $value->$key = is_array($f) ? array() : null;
                   }
 
-                  // handle setting default value(s)
-                  if(property_exists($value, $key))
+                  // handle setting default value
+                  if($value->$key === null)
                   {
                      // use first subframe if frame is an array
                      if(is_array($f))
@@ -2653,37 +2653,13 @@ function _frame($subjects, $input, $frame, $embeds, $options)
                      $omitOn = property_exists($f, '@omitDefault') ?
                         $f->{'@omitDefault'} :
                         $options->defaults->omitDefaultOn;
-
-                     if($value->$key === null)
+                     if($omitOn)
                      {
-                        if($omitOn)
-                        {
-                           unset($value->$key);
-                        }
-                        else if(property_exists($f, '@default'))
-                        {
-                           $value->$key = $f->{'@default'};
-                        }
+                        unset($value->$key);
                      }
-                     else if(is_array($value->$key))
+                     else if(property_exists($f, '@default'))
                      {
-                        $tmp = array();
-                        foreach($value->$key as $v)
-                        {
-                           if($v === null)
-                           {
-                              // do not auto-include null in arrays
-                              if(!$omitOn and property_exists($f, '$default'))
-                              {
-                                 $tmp[] = $f->{'$default'};
-                              }
-                           }
-                           else
-                           {
-                              $tmp[] = $v;
-                           }
-                        }
-                        $value->$key = $tmp;
+                        $value->$key = $f->{'@default'};
                      }
                   }
                }