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

tripal/includes/TripalEntityUIController.inc

@@ -221,6 +221,7 @@ function tripal_view_entity($entity, $view_mode = 'full') {
 
    // For each entity retrieved add a row to the data listing.
    //while ($entity = $entities->fetchObject()) {
+   if (!isset($results['TripalEntity'])) $results['TripalEntity'] = array();
    foreach ($results['TripalEntity'] as $entity_id => $stub) {
      $vocabulary = '';
      $term_name = '';

tripal_chado/includes/fields/chado_linker__relationship.inc

@@ -343,7 +343,11 @@ class chado_linker__relationship extends TripalField {
     $default_cv = tripal_get_default_cv($field_table, 'type_id');
     $options = array();
     if (!$default_cv) {
-      drupal_set_message("There is no default vocabulary set for the relationships....");
+      $msg = t('There is no default vocabulary set for the relationship types.');
+      if (module_exists('tripal_chado')) {
+        $msg .= t(' Please set the default vocabulary at <a href="@url" target="_blank">Tripal > Data Storage > Chado > Vocabulary Defaults.</a>', array('@url' => url('/admin/tripal/storage/chado/vocab')));
+      }
+      drupal_set_message($msg, 'warning');
     }
     else {
       $options = tripal_get_cvterm_select_options($default_cv->cv_id, TRUE);