- Rollback of E_ALL patch. Too much extra breakage.

1 files changed, 10 insertions, 7 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index c24eb8355..4f3cafefd 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1275,9 +1275,12 @@ function user_register() {
 
   // Remove form_group around default fields if there are no other groups.
   if (!$extra) {
-    foreach ($form['account'] as $key => $value) {
-      $form[$key] = $value;
-    }
+    $form['name'] = $form['account']['name'];
+    $form['mail'] = $form['account']['mail'];
+    $form['pass'] = $form['account']['pass'];
+    $form['status'] = $form['account']['status'];
+    $form['roles'] = $form['account']['roles'];
+    $form['notify'] = $form['account']['notify'];
     unset($form['account']);
   }
   else {
@@ -1819,7 +1822,7 @@ function user_admin_access() {
   if (count($rows) == 0) {
     $rows[] = array(array('data' => '<em>'. t('There are currently no access rules.') .'</em>', 'colspan' => 5));
   }
-  $output = theme('table', $header, $rows);
+  $output .= theme('table', $header, $rows);
 
   return $output;
 }
@@ -2061,7 +2064,7 @@ function theme_user_admin_new_role($form) {
       $rows[] = array($name, t('locked'), $edit_permissions);
     }
   }
-  $rows[] = array(drupal_render($form['name']), array('data' => drupal_render($form['submit']), 'colspan' => 2));
+  $rows[] = array(drupal_render($form['name']), array('data' => drupal_render($form['submit']), colspan => 2));
 
   $output = drupal_render($form);
   $output .= theme('table', $header, $rows);
@@ -2410,7 +2413,7 @@ function user_admin($callback_arg = '') {
       $output = drupal_get_form('user_register');
       break;
     default:
-      if (isset($_POST['accounts']) && $_POST['operation'] == 'delete') {
+      if ($_POST['accounts'] && $_POST['operation'] == 'delete') {
         $output = drupal_get_form('user_multiple_delete_confirm');
       }
       else {
@@ -2670,7 +2673,7 @@ function theme_user_filter_form($form) {
  */
 function theme_user_filters($form) {
   $output = '<ul class="clear-block">';
-  if (isset($form['current']) && sizeof($form['current'])) {
+  if (sizeof($form['current'])) {
     foreach (element_children($form['current']) as $key) {
       $output .= '<li>'. drupal_render($form['current'][$key]) .'</li>';
     }