From b8755f1127a6ba890c24a888f0f59560b22e341c Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 21 Aug 2009 21:35:52 +0000
Subject: [PATCH] Autofocus password, not name, if name is prefilled

---
 includes/templates/Userlogin.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 7a173002f9..5a4d3f9c8b 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -41,9 +41,10 @@ class UserloginTemplate extends QuickTemplate {
 				'id' => 'wpName1',
 				'tabindex' => '1',
 				'size' => '20',
-				'required',
-				'autofocus'
-			) ); ?>
+				'required'
+				# Can't do + array( 'autofocus' ) because + for arrays in PHP
+				# only works right for associative arrays!  Thanks, PHP.
+			) + ( $this->data['name'] ? array() : array( 'autofocus' => '' ) ) ); ?>
 
 			</td>
 		</tr>
@@ -56,7 +57,7 @@ class UserloginTemplate extends QuickTemplate {
 				'id' => 'wpPassword1',
 				'tabindex' => '2',
 				'size' => '20'
-			) ); ?>
+			) + ( $this->data['name'] ? array( 'autofocus' ) : array() ) ); ?>
 
 			</td>
 		</tr>
-- 
2.20.1