- #44133: User login block not fully themed

modules/user.module

@@ -528,13 +528,14 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
           $form['name'] = array('#type' => 'textfield', '#title' => t('Username'), '#maxlength' => 64, '#size' => 15);
           $form['pass'] = array('#type' => 'password', '#title' => t('Password'), '#maxlength' => 64, '#size' => 15);
           $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
-          $output .= drupal_get_form('user_login_block', $form, 'user_login');
+
           if (variable_get('user_register', 1)) {
             $items[] = l(t('Create new account'), 'user/register', array('title' => t('Create a new user account.')));
           }
           $items[] = l(t('Request new password'), 'user/password', array('title' => t('Request new password via e-mail.')));
+          $form['links'] = array('#value' => theme('item_list', $items));
 
-          $output .= theme('item_list', $items);
+          $output .= drupal_get_form('user_login_block', $form, 'user_login');
 
           $block['subject'] = t('User login');
           $block['content'] = $output;

modules/user/user.module

@@ -528,13 +528,14 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
           $form['name'] = array('#type' => 'textfield', '#title' => t('Username'), '#maxlength' => 64, '#size' => 15);
           $form['pass'] = array('#type' => 'password', '#title' => t('Password'), '#maxlength' => 64, '#size' => 15);
           $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
-          $output .= drupal_get_form('user_login_block', $form, 'user_login');
+
           if (variable_get('user_register', 1)) {
             $items[] = l(t('Create new account'), 'user/register', array('title' => t('Create a new user account.')));
           }
           $items[] = l(t('Request new password'), 'user/password', array('title' => t('Request new password via e-mail.')));
+          $form['links'] = array('#value' => theme('item_list', $items));
 
-          $output .= theme('item_list', $items);
+          $output .= drupal_get_form('user_login_block', $form, 'user_login');
 
           $block['subject'] = t('User login');
           $block['content'] = $output;