| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -58,6 +58,7 @@ |
| 59 | 59 | * Lazy-load up the most commonly required state information |
| 60 | 60 | */ |
| 61 | 61 | private function loadState() { |
| | 62 | + wfProfileIn( __METHOD__ ); |
| 62 | 63 | if( !isset( $this->mGlobalId ) ) { |
| 63 | 64 | global $wgDBname; |
| 64 | 65 | $dbr = self::getCentralSlaveDB(); |
| — | — | @@ -65,7 +66,8 @@ |
| 66 | 67 | $localuser = self::tableName( 'localuser' ); |
| 67 | 68 | |
| 68 | 69 | $sql = |
| 69 | | - "SELECT gu_id, lu_dbname, gu_salt, gu_password,gu_authtoken,gu_locked,gu_hidden,gu_registration |
| | 70 | + "SELECT gu_id, lu_dbname, gu_salt, gu_password,gu_authtoken, |
| | 71 | + gu_locked,gu_hidden,gu_registration,gu_email,gu_email_authenticated |
| 70 | 72 | FROM $globaluser |
| 71 | 73 | LEFT OUTER JOIN $localuser |
| 72 | 74 | ON gu_name=lu_name |
| — | — | @@ -84,11 +86,14 @@ |
| 85 | 87 | $this->mLocked = $row->gu_locked; |
| 86 | 88 | $this->mHidden = $row->gu_hidden; |
| 87 | 89 | $this->mRegistration = $row->gu_registration; |
| | 90 | + $this->mEmail = $row->gu_email; |
| | 91 | + $this->mAuthenticationTimestamp = $row->gu_email_authenticated; |
| 88 | 92 | } else { |
| 89 | 93 | $this->mGlobalId = 0; |
| 90 | 94 | $this->mIsAttached = false; |
| 91 | 95 | } |
| 92 | 96 | } |
| | 97 | + wfProfileOut( __METHOD__ ); |
| 93 | 98 | } |
| 94 | 99 | |
| 95 | 100 | /** |
| — | — | @@ -1087,19 +1092,13 @@ |
| 1088 | 1093 | } |
| 1089 | 1094 | |
| 1090 | 1095 | function getEmail() { |
| 1091 | | - $dbr = self::getCentralDB(); |
| 1092 | | - return $dbr->selectField( self::tableName( 'globaluser' ), |
| 1093 | | - 'gu_email', |
| 1094 | | - array( 'gu_id' => $this->getId() ), |
| 1095 | | - __METHOD__ ); |
| | 1096 | + $this->loadState(); |
| | 1097 | + return $this->mEmail; |
| 1096 | 1098 | } |
| 1097 | 1099 | |
| 1098 | 1100 | function getEmailAuthenticationTimestamp() { |
| 1099 | | - $dbr = self::getCentralDB(); |
| 1100 | | - return $dbr->selectField( self::tableName( 'globaluser' ), |
| 1101 | | - 'gu_email_authenticated', |
| 1102 | | - array( 'gu_id' => $this->getId() ), |
| 1103 | | - __METHOD__ ); |
| | 1101 | + $this->loadState(); |
| | 1102 | + return $this->mAuthenticationTimestamp; |
| 1104 | 1103 | } |
| 1105 | 1104 | |
| 1106 | 1105 | /** |
| Index: trunk/extensions/CentralAuth/CentralAuth.php |
| — | — | @@ -44,7 +44,7 @@ |
| 45 | 45 | $wgCentralAuthCookieDomains = $wgServer; |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | | - * Prefix for CentralAuth cookies. |
| | 48 | + * Prefix for CentralAuth global authentication cookies. |
| 49 | 49 | */ |
| 50 | 50 | $wgCentralAuthCookiePrefix = 'centralauth_'; |
| 51 | 51 | |
| — | — | @@ -54,11 +54,6 @@ |
| 55 | 55 | */ |
| 56 | 56 | $wgCentralAuthAutoLoginWikis = array(); |
| 57 | 57 | |
| 58 | | -/** |
| 59 | | - * Prefix for CentralAuth global auto-authentication cookies |
| 60 | | - */ |
| 61 | | - $wgCentralAuthCookiePrefix = 'centralauth'; |
| 62 | | - |
| 63 | 58 | $wgExtensionCredits['specialpage'][] = array( |
| 64 | 59 | 'name' => 'Central Auth', |
| 65 | 60 | 'url' => 'http://www.mediawiki.org/wiki/Extension:CentralAuth', |
| Index: trunk/extensions/CentralAuth/SpecialAutoLogin.php |
| — | — | @@ -11,8 +11,6 @@ |
| 12 | 12 | |
| 13 | 13 | global $IP; |
| 14 | 14 | |
| 15 | | -require_once( "$IP/includes/StreamFile.php" ); |
| 16 | | - |
| 17 | 15 | class SpecialAutoLogin extends UnlistedSpecialPage |
| 18 | 16 | { |
| 19 | 17 | function SpecialAutoLogin() { |
| — | — | @@ -52,6 +50,8 @@ |
| 53 | 51 | } |
| 54 | 52 | } |
| 55 | 53 | |
| | 54 | + require_once( "$IP/includes/StreamFile.php" ); |
| | 55 | + |
| 56 | 56 | wfStreamFile( dirname(__FILE__).'/1x1.png' ); |
| 57 | 57 | |
| 58 | 58 | $wgOut->disable(); |