Merge branch '6.x-0.4-dev' of git.drupal.org:sandbox/spficklin/1337878 into 6.x-0.4-dev

tripal_core/tripal_core.api.inc

@@ -1259,10 +1259,11 @@ function tripal_core_expand_chado_vars($object, $type, $to_expand, $table_option
             $table_options
           );
           if ($foreign_object) {
-            // in the case where the a foreign key relationships exists more
+            // in the case where the foreign key relationships exists more
             // than once with the same table we want to alter the
             // array structure
             if (count($foreign_table_desc['foreign keys'][$base_table]['columns']) > 1) {
+              $object->{$foreign_table} = new stdClass();
               $object->{$foreign_table}->{$left} = $foreign_object;
               $object->expanded = $to_expand;
             }

tripal_feature/tripal_feature.module

@@ -949,7 +949,7 @@ function chado_feature_load($node) {
   $values = array('feature_id' => $feature_id);
   $feature = tripal_core_generate_chado_var('feature', $values);
 
-  $addition = new stdClass();
+  $additions = new stdClass();
   $additions->feature = $feature;
   return $additions;
 }
@@ -2450,4 +2450,4 @@ function tripal_feature_coder_ignore() {
     'path' => drupal_get_path('module', 'tripal_feature'),
     'line prefix' => drupal_get_path('module', 'tripal_feature'),
   );
-}
+}