Browse Source

Missed non-node hook_view_node implementations: now switched to #theme as well

Lacey Sanderson 10 years ago
parent
commit
6f22290db5

+ 4 - 2
tripal_genetic/tripal_genetic.module

@@ -149,7 +149,8 @@ function tripal_genetic_node_view($node, $view_mode, $langcode) {
       // template from this module as the ND module would superceed this.
       if (!array_key_exists('tripal_feature_nd_genotypes', $node->content)) {
         $node->content['tripal_feature_genotypes'] = array(
-          '#markup' => theme('tripal_feature_genotypes', array('node' => $node)),
+          '#theme' => 'tripal_feature_genotypes',
+          '#node' => $node,
           '#tripal_toc_id'    => 'genotypes',
           '#tripal_toc_title' => 'Genotypes',
         );
@@ -164,7 +165,8 @@ function tripal_genetic_node_view($node, $view_mode, $langcode) {
       // template from this module as the ND module would superceed this.
       if (!array_key_exists('tripal_stock_nd_genotypes', $node->content)) {
         $node->content['tripal_stock_genotypes'] = array(
-          '#markup' => theme('tripal_stock_genotypes', array('node' => $node)),
+          '#theme' => 'tripal_stock_genotypes',
+          '#node' => $node,
           '#tripal_toc_id'    => 'genotypes',
           '#tripal_toc_title' => 'Genotypes',
         );

+ 6 - 3
tripal_natural_diversity/tripal_natural_diversity.module

@@ -142,7 +142,8 @@ function tripal_natural_diversity_node_view($node, $view_mode, $langcode) {
           unset($node->content['tripal_feature_genotypes']);
         }
         $node->content['tripal_feature_nd_genotypes'] = array(
-          '#markup' => theme('tripal_feature_nd_genotypes', array('node' => $node)),
+          '#theme' => 'tripal_feature_nd_genotypes',
+          '#node' => $node,
           '#tripal_toc_id'    => 'genotypes',
           '#tripal_toc_title' => 'Genotypes',
         );
@@ -157,12 +158,14 @@ function tripal_natural_diversity_node_view($node, $view_mode, $langcode) {
           unset($node->content['tripal_stock_genotypes']);
         }
         $node->content['tripal_stock_nd_genotypes'] = array(
-          '#markup' => theme('tripal_stock_nd_genotypes', array('node' => $node)),
+          '#theme' => 'tripal_stock_nd_genotypes',
+          '#node' => $node,
           '#tripal_toc_id'    => 'genotypes',
           '#tripal_toc_title' => 'Genotypes',
         );
         $node->content['tripal_stock_nd_phenotypes'] = array(
-          '#markup' => theme('tripal_stock_nd_phenotypes', array('node' => $node)),
+          '#theme' => 'tripal_stock_nd_phenotypes',
+          '#node' => $node,
           '#tripal_toc_id'    => 'phenotypes',
           '#tripal_toc_title' => 'Phenotypes',
         );

+ 2 - 1
tripal_phenotype/tripal_phenotype.module

@@ -174,7 +174,8 @@ function tripal_phenotype_node_view($node, $view_mode, $langcode) {
       // Show feature browser and counts
       if ($view_mode == 'full') {
         $node->content['tripal_feature_phenotypes'] = array(
-          '#markup' => theme('tripal_feature_phenotypes', array('node' => $node)),
+          '#theme' => 'tripal_feature_phenotypes',
+          '#node' => $node,
           '#tripal_toc_id'    => 'phenotypes',
           '#tripal_toc_title' => 'Phenotypes',
         );