X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialUserlogin.php;h=a77c79eb09ac6056de0ff8371a9f7ebb310c8f6b;hb=032c1755d20b63ae52c3598bba29bf3a5e7dac70;hp=6b61ef99e4ee660df122fe8fca436ec0eb784211;hpb=9fe2ba22f722a7e335f912a4db3c06b4613ba58a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 6b61ef99e4..a77c79eb09 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -275,7 +275,7 @@ class LoginForm extends SpecialPage {
 	 */
 	public function execute( $subPage ) {
 		// Make sure session is persisted
-		$session = MediaWiki\Session\SessionManager::getGlobalSession();
+		$session = SessionManager::getGlobalSession();
 		$session->persist();
 
 		$this->load();
@@ -714,7 +714,7 @@ class LoginForm extends SpecialPage {
 		DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 0, 0, 0, 1 ) );
 
 		// Watch user's userpage and talk page
-		$u->addWatch( $u->getUserPage(), WatchedItem::IGNORE_USER_RIGHTS );
+		$u->addWatch( $u->getUserPage(), User::IGNORE_USER_RIGHTS );
 
 		return Status::newGood( $u );
 	}
@@ -792,7 +792,7 @@ class LoginForm extends SpecialPage {
 		}
 
 		$isAutoCreated = false;
-		if ( $u->getID() == 0 ) {
+		if ( $u->getId() == 0 ) {
 			$status = $this->attemptAutoCreate( $u );
 			if ( $status !== self::SUCCESS ) {
 				return $status;
@@ -1059,7 +1059,6 @@ class LoginForm extends SpecialPage {
 	function processLogin() {
 		global $wgLang, $wgSecureLogin, $wgInvalidPasswordReset;
 
-		$cache = ObjectCache::getLocalClusterInstance();
 		$authRes = $this->authenticateUserData();
 		switch ( $authRes ) {
 			case self::SUCCESS:
@@ -1647,8 +1646,8 @@ class LoginForm extends SpecialPage {
 
 	/**
 	 * Get the login token from the current session
-	 * @since 1.27 returns a MediaWiki\\Session\\Token instead of a string
-	 * @return MediaWiki\\Session\\Token
+	 * @since 1.27 returns a MediaWiki\Session\Token instead of a string
+	 * @return MediaWiki\Session\Token
 	 */
 	public static function getLoginToken() {
 		global $wgRequest;
@@ -1678,8 +1677,8 @@ class LoginForm extends SpecialPage {
 
 	/**
 	 * Get the createaccount token from the current session
-	 * @since 1.27 returns a MediaWiki\\Session\\Token instead of a string
-	 * @return MediaWiki\\Session\\Token
+	 * @since 1.27 returns a MediaWiki\Session\Token instead of a string
+	 * @return MediaWiki\Session\Token
 	 */
 	public static function getCreateaccountToken() {
 		global $wgRequest;
@@ -1716,7 +1715,7 @@ class LoginForm extends SpecialPage {
 			$wgCookieSecure = false;
 		}
 
-		MediaWiki\Session\SessionManager::getGlobalSession()->resetId();
+		SessionManager::getGlobalSession()->resetId();
 	}
 
 	/**