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

tripal_chado/includes/fields/chado_gene__transcripts.inc

@@ -132,8 +132,8 @@ class chado_gene__transcripts extends TripalField {
       $type = $transcript['type'];
 
       // Add a link i there is an entity.
-      if (array_key_exists('entity_id', $transcript) and $transcript['$entity_id']) {
-        $entity_id = $transcript['entity_id'];
+      if (array_key_exists('entity_id', $item) and $item['entity_id']) {
+        $entity_id = $item['entity_id'];
         $feature_name = l($feature_name, "bio_data/" . $entity_id, array('attributes' => array('target' => "_blank")));
       }
       $rows[] = array($feature_name, $feature_uname, $type, $loc);

tripal_chado/includes/fields/chado_linker__phenotype.inc

@@ -7,7 +7,7 @@ class chado_linker__phenotype extends TripalField {
    */
   public function field_info() {
     return array(
-      'label' => t('Genotypes'),
+      'label' => t('Phenotypes'),
       'description' => t('Associates an indviddual or organization with
           this record.'),
       'default_widget' => 'chado_linker__phenotype_widget',
@@ -25,7 +25,7 @@ class chado_linker__phenotype extends TripalField {
    */
   function widget_info() {
     return array(
-      'label' => t('Genotypes'),
+      'label' => t('Phenotypes'),
       'field types' => array('chado_linker__phenotype'),
     );
   }
@@ -35,7 +35,7 @@ class chado_linker__phenotype extends TripalField {
    */
   public function formatter_info() {
     return array(
-      'label' => t('Genotypes'),
+      'label' => t('Phenotypes'),
       'field types' => array('chado_linker__phenotype'),
       'settings' => array(
       ),
@@ -69,7 +69,7 @@ class chado_linker__phenotype extends TripalField {
       'widget_type' => 'chado_linker__phenotype_widget',
       'widget_settings' => array('display_label' => 1),
       'description' => '',
-      'label' => 'Genotypes',
+      'label' => 'Phenotypes',
       'is_required' => 0,
       'cardinality' => FIELD_CARDINALITY_UNLIMITED,
       'storage' => 'field_chado_storage',