From e6fe09947806fb8c095b857dd747669bee73a628 Mon Sep 17 00:00:00 2001
From: Adam Vessey <adam@discoverygarden.ca>
Date: Tue, 9 Jul 2013 17:46:36 +0000
Subject: [PATCH] Carry through through the function rename.

Also, be sure to call the transformer function after the alter, just in case
a modules adds in another value in the manner it used to use 'em.
---
 islandora.module | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/islandora.module b/islandora.module
index 8f552f37..574aef51 100644
--- a/islandora.module
+++ b/islandora.module
@@ -624,7 +624,7 @@ function islandora_manage_overview_object(AbstractObject $object) {
   $output = array();
   foreach (islandora_build_hook_list(ISLANDORA_OVERVIEW_HOOK, $object->models) as $hook) {
     $temp = module_invoke_all($hook, $object);
-    islandora_array_of_markup_to_renderable_array($temp);
+    islandora_as_renderable_array($temp);
     if (!empty($temp)) {
       $output = array_merge_recursive($output, $temp);
     }
@@ -635,6 +635,7 @@ function islandora_manage_overview_object(AbstractObject $object) {
   }
   arsort($output);
   drupal_alter(ISLANDORA_OVERVIEW_HOOK, $object, $output);
+  islandora_as_renderable_array($output);
   return $output;
 }
 
@@ -678,7 +679,7 @@ function islandora_edit_object(AbstractObject $object) {
   $output = array();
   foreach (islandora_build_hook_list(ISLANDORA_EDIT_HOOK, $object->models) as $hook) {
     $temp = module_invoke_all($hook, $object);
-    islandora_array_of_markup_to_renderable_array($temp);
+    islandora_as_renderable_array($temp);
     if (!empty($temp)) {
       $output = array_merge_recursive($output, $temp);
     }
@@ -689,6 +690,7 @@ function islandora_edit_object(AbstractObject $object) {
   }
   arsort($output);
   drupal_alter(ISLANDORA_EDIT_HOOK, $object, $output);
+  islandora_as_renderable_array($output);
   return $output;
 }
 
@@ -749,7 +751,7 @@ function islandora_view_object(AbstractObject $object) {
     // @todo Remove page number and size from this hook, implementers of the
     // hook should use drupal page handling directly.
     $temp = module_invoke_all($hook, $object, $page_number, $page_size);
-    islandora_array_of_markup_to_renderable_array($temp);
+    islandora_as_renderable_array($temp);
     if (!empty($temp)) {
       $output = array_merge_recursive($output, $temp);
     }
@@ -760,6 +762,7 @@ function islandora_view_object(AbstractObject $object) {
   }
   arsort($output);
   drupal_alter($hooks, $object, $output);
+  islandora_as_renderable_array($output);
   return $output;
 }