From 76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 25 May 2009 10:43:54 +0000
Subject: - Patch #470594 by Moshe: convert more pages and blocks to return
 arrays.

---
 modules/system/system.module | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/system.module b/modules/system/system.module
index b82e72595..e5d895f1f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1686,7 +1686,6 @@ function system_action_info() {
  * Menu callback. Display an overview of available and configured actions.
  */
 function system_actions_manage() {
-  $output = '';
   actions_synchronize();
   $actions = actions_list();
   $actions_map = actions_actions_map($actions);
@@ -1730,15 +1729,15 @@ function system_actions_manage() {
     if (!empty($pager)) {
       $row[] = array(array('data' => $pager, 'colspan' => '3'));
     }
-    $output .= '<h3>' . t('Actions available to Drupal:') . '</h3>';
-    $output .= theme('table', $header, $row);
+    $build['system_actions_header'] = array('#markup' => '<h3>' . t('Actions available to Drupal:') . '</h3>');
+    $build['system_actions_table'] = array('#markup' => theme('table', $header, $row));
   }
 
   if ($actions_map) {
-    $output .= drupal_render(drupal_get_form('system_actions_manage_form', $options));
+    $build['system_actions_manage_form'] = drupal_get_form('system_actions_manage_form', $options);
   }
 
-  return $output;
+  return $build;
 }
 
 /**
-- 
cgit v1.2.3