Merge branch '7.x-2.x' of github.com:tripal/tripal into 7.x-2.x

tripal_core/tripal_core.module

@@ -672,7 +672,7 @@ function tripal_core_field_widget_form_alter(&$element, &$form_state, $context)
 
   // If the name of the field is 'field_resource_links' then we want to
   // add a fieldset of tokens.
-  if ($element['#field_name'] == 'field_resource_links') {
+  if (isset($element['#field_name']) AND $element['#field_name'] == 'field_resource_links') {
 
     // Add the tokens fieldset to the last element.
     $num_elements = count($context['items']);
@@ -732,4 +732,4 @@ function tripal_core_import_api() {
   module_load_include('inc', 'tripal_core', 'api/tripal_core.schema_v1.3.api');
   module_load_include('inc', 'tripal_core', 'api/tripal_core.tripal_variables.api');
   module_load_include('inc', 'tripal_core', 'api/tripal_core.tripal.api');
-}
+}