diff options
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.admin.inc | 10 | ||||
| -rw-r--r-- | modules/user/user.module | 4 |
2 files changed, 7 insertions, 7 deletions
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; |