summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.admin.inc8
-rw-r--r--modules/user/user.module8
2 files changed, 10 insertions, 6 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 6a2b05136..b0e8d50a5 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -651,7 +651,7 @@ function theme_user_admin_perm($form) {
}
$output = theme('system_compact_link');
$output .= theme('table', $header, $rows, array('id' => 'permissions'));
- $output .= drupal_render($form);
+ $output .= drupal_render_children($form);
return $output;
}
@@ -788,7 +788,7 @@ function theme_user_admin_account($form) {
$output .= drupal_render($form['pager']);
}
- $output .= drupal_render($form);
+ $output .= drupal_render_children($form);
return $output;
}
@@ -811,7 +811,7 @@ function theme_user_admin_new_role($form) {
}
$rows[] = array(drupal_render($form['name']), array('data' => drupal_render($form['submit']), 'colspan' => 2));
- $output = drupal_render($form);
+ $output = drupal_render_children($form);
$output .= theme('table', $header, $rows);
return $output;
@@ -826,7 +826,7 @@ function theme_user_filter_form($form) {
$output = '<div id="user-admin-filter">';
$output .= drupal_render($form['filters']);
$output .= '</div>';
- $output .= drupal_render($form);
+ $output .= drupal_render_children($form);
return $output;
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 39e98e8e8..b430121d4 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -753,8 +753,12 @@ function user_search($op = 'search', $keys = NULL, $skip_access_check = FALSE) {
*/
function user_elements() {
return array(
- 'user_profile_category' => array(),
- 'user_profile_item' => array(),
+ 'user_profile_category' => array(
+ '#theme_wrapper' => 'user_profile_category'
+ ),
+ 'user_profile_item' => array(
+ '#theme' => 'user_profile_item'
+ ),
);
}