summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-05-12 08:37:45 +0000
committerDries Buytaert <dries@buytaert.net>2009-05-12 08:37:45 +0000
commit847304a2934b062544e87160ec8524e9275e8247 (patch)
tree9dfd13d0402d9a109694e9a4e4ad931201da0ec1 /modules
parentda87545c487eb2e46dbc6c7b9e054b2e5be4a5b0 (diff)
downloadbrdo-847304a2934b062544e87160ec8524e9275e8247.tar.gz
brdo-847304a2934b062544e87160ec8524e9275e8247.tar.bz2
- Patch #353069 by Moshe Weitzman, dmitrig01: make drupal_get_form() return unrendered forms.
Diffstat (limited to 'modules')
-rw-r--r--modules/comment/comment.admin.inc4
-rw-r--r--modules/comment/comment.module2
-rw-r--r--modules/dblog/dblog.admin.inc4
-rw-r--r--modules/openid/openid.inc2
-rw-r--r--modules/openid/openid.pages.inc2
-rw-r--r--modules/poll/poll.module8
-rw-r--r--modules/search/search.module2
-rw-r--r--modules/search/search.pages.inc2
-rw-r--r--modules/simpletest/tests/form_test.module12
-rw-r--r--modules/system/system.admin.inc6
-rw-r--r--modules/system/system.module2
-rw-r--r--modules/taxonomy/taxonomy.admin.inc1
-rw-r--r--modules/trigger/trigger.admin.inc6
-rw-r--r--modules/user/user.admin.inc10
-rw-r--r--modules/user/user.module4
15 files changed, 32 insertions, 35 deletions
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index 15c426390..156149754 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -13,10 +13,10 @@ function comment_admin($type = 'new') {
$edit = $_POST;
if (isset($edit['operation']) && ($edit['operation'] == 'delete') && isset($edit['comments']) && $edit['comments']) {
- return drupal_get_form('comment_multiple_delete_confirm');
+ return drupal_render(drupal_get_form('comment_multiple_delete_confirm'));
}
else {
- return drupal_get_form('comment_admin_overview', $type, arg(4));
+ return drupal_render(drupal_get_form('comment_admin_overview', $type, arg(4)));
}
}
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 0a59cde46..a471b65f1 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1626,7 +1626,7 @@ function comment_form(&$form_state, $edit, $title = NULL) {
* A string containing the box output.
*/
function theme_comment_form_box($edit, $title = NULL) {
- $content = drupal_get_form('comment_form', $edit, $title);
+ $content = drupal_render(drupal_get_form('comment_form', $edit, $title));
$output = '<h2 class="title">' . $title . '</h2><div>' . $content . '</div>';
return $output;
}
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index c5a27f86d..9324ac621 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -47,8 +47,8 @@ function dblog_overview() {
WATCHDOG_EMERG => 'dblog-emerg',
);
- $output = drupal_get_form('dblog_filter_form');
- $output .= drupal_get_form('dblog_clear_log_form');
+ $output = drupal_render(drupal_get_form('dblog_filter_form'));
+ $output .= drupal_render(drupal_get_form('dblog_clear_log_form'));
$header = array(
' ',
diff --git a/modules/openid/openid.inc b/modules/openid/openid.inc
index c0ed8a936..7df2262d6 100644
--- a/modules/openid/openid.inc
+++ b/modules/openid/openid.inc
@@ -69,7 +69,7 @@ function openid_redirect_http($url, $message) {
*/
function openid_redirect($url, $message) {
$output = '<html><head><title>' . t('OpenID redirect') . "</title></head>\n<body>";
- $output .= drupal_get_form('openid_redirect_form', $url, $message);
+ $output .= drupal_render(drupal_get_form('openid_redirect_form', $url, $message));
$output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
$output .= "</body></html>\n";
print $output;
diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc
index 2f361a9b6..94c2a441f 100644
--- a/modules/openid/openid.pages.inc
+++ b/modules/openid/openid.pages.inc
@@ -54,7 +54,7 @@ function openid_user_identities($account) {
}
$output = theme('table', $header, $rows);
- $output .= drupal_get_form('openid_user_add');
+ $output .= drupal_render(drupal_get_form('openid_user_add'));
return $output;
}
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 02b6a81c7..1c33e5ee9 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -567,14 +567,10 @@ function poll_view($node, $teaser = FALSE, $block = FALSE) {
}
if (!empty($node->allowvotes) && ($block || empty($node->show_results))) {
- $node->content['body'] = array(
- '#markup' => drupal_get_form('poll_view_voting', $node, $block),
- );
+ $node->content['poll_view_voting'] = drupal_get_form('poll_view_voting', $node, $block);
}
else {
- $node->content['body'] = array(
- '#markup' => poll_view_results($node, $teaser, $block),
- );
+ $node->content['poll_view_results'] = array('#markup' => poll_view_results($node, $teaser, $block));
}
return $node;
}
diff --git a/modules/search/search.module b/modules/search/search.module
index cd57dfd24..6ce7bd21b 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -175,7 +175,7 @@ function search_block_list() {
*/
function search_block_view($delta = '') {
if (user_access('search content')) {
- $block['content'] = drupal_get_form('search_block_form');
+ $block['content'] = drupal_render(drupal_get_form('search_block_form'));
$block['subject'] = t('Search');
return $block;
}
diff --git a/modules/search/search.pages.inc b/modules/search/search.pages.inc
index f431994d8..a8d7ce8fb 100644
--- a/modules/search/search.pages.inc
+++ b/modules/search/search.pages.inc
@@ -40,7 +40,7 @@ function search_view($type = 'node') {
}
// Construct the search form.
- $output = drupal_get_form('search_form', NULL, $keys, $type);
+ $output = drupal_render(drupal_get_form('search_form', NULL, $keys, $type));
$output .= $results;
return $output;
diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module
index 547de062e..f9053c57e 100644
--- a/modules/simpletest/tests/form_test.module
+++ b/modules/simpletest/tests/form_test.module
@@ -70,13 +70,13 @@ function form_test_menu() {
}
/**
- * Generate a page with three form, to test the clean_id generation.
+ * Generate a page with three forms, to test the clean_id generation.
*/
function form_test_form_clean_id_page() {
- $output = drupal_get_form('form_test_test_form');
- $output .= drupal_get_form('form_test_test_form');
- $output .= drupal_get_form('form_test_test_form');
- return $output;
+ $build['form_test_test_form1'] = drupal_get_form('form_test_test_form');
+ $build['form_test_test_form2'] = drupal_get_form('form_test_test_form');
+ $build['form_test_test_form3'] = drupal_get_form('form_test_test_form');
+ return $build;
}
/**
@@ -335,7 +335,7 @@ function form_storage_test_form(&$form_state) {
);
}
else {
- $form['content'] = array('#value' => 'This is the second step.');
+ $form['body'] = array('#value' => 'This is the second step.');
$form['submit'] = array(
'#type' => 'submit',
'#value' => 'Save',
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index bc3dea60a..d3a607ce3 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1084,11 +1084,11 @@ function system_ip_blocking() {
);
}
- $output .= drupal_get_form('system_ip_blocking_form');
+ $build['system_ip_blocking_form'] = drupal_get_form('system_ip_blocking_form');
- $output .= theme('table', $header, $rows);
+ $build['system_ip_blocking_table'] = array('#markup' => theme('table', $header, $rows));
- return $output;
+ return $build;
}
/**
diff --git a/modules/system/system.module b/modules/system/system.module
index 51ce7e288..57f0b787e 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1709,7 +1709,7 @@ function system_actions_manage() {
}
if ($actions_map) {
- $output .= drupal_get_form('system_actions_manage_form', $options);
+ $output .= drupal_render(drupal_get_form('system_actions_manage_form', $options));
}
return $output;
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index 5c5c4adb7..b71db8301 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -64,6 +64,7 @@ function taxonomy_overview_vocabularies_submit($form, &$form_state) {
*/
function theme_taxonomy_overview_vocabularies($form) {
$rows = array();
+
foreach (element_children($form) as $key) {
if (isset($form[$key]['name'])) {
$vocabulary = &$form[$key];
diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc
index 7d6c2621e..02f9cff9d 100644
--- a/modules/trigger/trigger.admin.inc
+++ b/modules/trigger/trigger.admin.inc
@@ -21,17 +21,17 @@ function trigger_assign($type = NULL) {
drupal_goto('admin/build/trigger/node');
}
- $output = '';
+ $build = array();
$hooks = module_invoke_all('hook_info');
foreach ($hooks as $module => $hook) {
if (isset($hook[$type])) {
foreach ($hook[$type] as $op => $description) {
$form_id = 'trigger_' . $type . '_' . $op . '_assign_form';
- $output .= drupal_get_form($form_id, $type, $op, $description['runs when']);
+ $build[$form_id] = drupal_get_form($form_id, $type, $op, $description['runs when']);
}
}
}
- return $output;
+ return $build;
}
/**
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 1f9913746..0435f9621 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -12,18 +12,18 @@ function user_admin($callback_arg = '') {
switch ($op) {
case t('Create new account'):
case 'create':
- $output = drupal_get_form('user_register');
+ $build['user_register'] = drupal_get_form('user_register');
break;
default:
if (!empty($_POST['accounts']) && isset($_POST['operation']) && ($_POST['operation'] == 'cancel')) {
- $output = drupal_get_form('user_multiple_cancel_confirm');
+ $build['user_multiple_cancel_confirm'] = drupal_get_form('user_multiple_cancel_confirm');
}
else {
- $output = drupal_get_form('user_filter_form');
- $output .= drupal_get_form('user_admin_account');
+ $build['user_filter_form'] = drupal_get_form('user_filter_form');
+ $build['user_admin_account'] = drupal_get_form('user_admin_account');
}
}
- return $output;
+ return $build;
}
/**
diff --git a/modules/user/user.module b/modules/user/user.module
index 29b43cb36..0611c53e6 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -138,7 +138,7 @@ function user_external_load($authname) {
* TRUE if the login succeeds, FALSE otherwise.
*/
function user_external_login($account, $edit = array()) {
- $form = drupal_get_form('user_login');
+ $form = drupal_render(drupal_get_form('user_login'));
$state['values'] = $edit;
if (empty($state['values']['name'])) {
@@ -1099,7 +1099,7 @@ function user_block_view($delta = '') {
if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
$block['subject'] = t('User login');
- $block['content'] = drupal_get_form('user_login_block');
+ $block['content'] = drupal_render(drupal_get_form('user_login_block'));
}
return $block;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 08:43:26 +0000