Fixes #2127

pods-framework · Apr 17, 2014 · 4ffa86f · 4ffa86f
1 parent dc7f40a
commit 4ffa86f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/fields/pick.php b/classes/fields/pick.php
@@ -616,8 +616,8 @@ public function schema ( $options = null ) {
     public function display ( $value = null, $name = null, $options = null, $pod = null, $id = null ) {
         $fields = null;
 
-        if ( is_object( $pod ) && isset( $pod->fields ) )
-            $fields = array_merge( $pod->fields, $pod->object_fields );
+        if ( is_object( $pod ) && isset( $pod->fields ) && isset( $pod->pod_data[ 'object_fields' ] ) )
+            $fields = array_merge( $pod->fields, $pod->pod_data[ 'object_fields' ] );
         elseif ( is_array( $pod ) && isset( $pod[ 'fields' ] ) )
             $fields = array_merge( $pod[ 'fields' ], $pod[ 'object_fields' ] );