Bläddra i källkod

Fixed some errors on tripal content pages.

Lacey Sanderson 7 år sedan
förälder
incheckning
8c9820868d
2 ändrade filer med 7 tillägg och 2 borttagningar
  1. 6 1
      tripal/includes/TripalEntityController.inc
  2. 1 1
      tripal/includes/tripal.entity.inc

+ 6 - 1
tripal/includes/TripalEntityController.inc

@@ -503,6 +503,11 @@ class TripalEntityController extends EntityAPIController {
           $field = field_info_field($field_name);
           $field_id = $field['id'];
 
+          // Add this field to the entity with default value.
+          if (!isset($queried_entities[$id]->$field_name)) {
+            $queried_entities[$id]->$field_name = array();
+          }
+
           // Options used for the field_attach_load function.
           $options = array();
           $options['field_id'] = $field['id'];
@@ -516,7 +521,7 @@ class TripalEntityController extends EntityAPIController {
             $cache_data = cache_get($cfid, 'cache_field');
             if (!empty($cache_data)) {
               $queried_entities[$id]->$field_name = $cache_data->data;
-              $queried_entities[$id]->$field_name['#processed'] = TRUE;
+              $queried_entities[$id]->{$field_name}['#processed'] = TRUE;
               continue;
             }
           }

+ 1 - 1
tripal/includes/tripal.entity.inc

@@ -333,7 +333,7 @@ function tripal_entity_view($entity, $type, $view_mode, $langcode) {
         $class = '';
         if (array_key_exists('auto_attach', $instance['settings']) and
             $instance['settings']['auto_attach'] == FALSE and
-            $entity->$child_name['#processed'] == FALSE) {
+            $entity->{$child_name}['#processed'] == FALSE) {
           // If the field is empty then try to use ajax to load it.
           $items = field_get_items('TripalEntity', $entity, $child_name);
           if (count($items) == 0 or empty($items[0]['value'])) {