summaryrefslogtreecommitdiff
path: root/modules/system
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-05-25 10:43:54 +0000
committerDries Buytaert <dries@buytaert.net>2009-05-25 10:43:54 +0000
commit76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6 (patch)
tree1014be2886f06d9c43ee127d1de2fb0e82f6d5e5 /modules/system
parent12024dbca416e8071dc34fb941e4970c150b0f47 (diff)
downloadbrdo-76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6.tar.gz
brdo-76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6.tar.bz2
- Patch #470594 by Moshe: convert more pages and blocks to return arrays.
Diffstat (limited to 'modules/system')
-rw-r--r--modules/system/system.module9
1 files changed, 4 insertions, 5 deletions
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;
}
/**