From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 19 May 2016 17:45:20 +0000 (+0000)
Subject: Merge "build: Enforce stylelints on fonts"
X-Git-Tag: 1.31.0-rc.0~6908
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=b5e165894003b6d0b19d44fea1ad332e30bd87b9;hp=82d6f1d89fb4521ea2355832aff4b4e0f9ba27fa;p=lhc%2Fweb%2Fwiklou.git

Merge "build: Enforce stylelints on fonts"
---

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index c6d3f6e75e..5d230c0697 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -872,7 +872,7 @@ class SpecialUndelete extends SpecialPage {
 			"ids" => $revisions,
 			"target" => $this->mTargetObj->getPrefixedText()
 		];
-		$url = SpecialPage::getTitleFor( "RevisionDelete" )->getFullURL( $query );
+		$url = SpecialPage::getTitleFor( 'Revisiondelete' )->getFullURL( $query );
 		$this->getOutput()->redirect( $url );
 	}
 
diff --git a/includes/user/User.php b/includes/user/User.php
index 71023c08a4..ce2ac830f0 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -3859,6 +3859,7 @@ class User implements IDBAccessObject {
 		if ( !$session->canSetUser() ) {
 			\MediaWiki\Logger\LoggerFactory::getInstance( 'session' )
 				->warning( __METHOD__ . ": Cannot log out of an immutable session" );
+			$error = 'immutable';
 		} elseif ( !$session->getUser()->equals( $this ) ) {
 			\MediaWiki\Logger\LoggerFactory::getInstance( 'session' )
 				->warning( __METHOD__ .
@@ -3866,6 +3867,7 @@ class User implements IDBAccessObject {
 				);
 			// But we still may as well make this user object anon
 			$this->clearInstanceCache( 'defaults' );
+			$error = 'wronguser';
 		} else {
 			$this->clearInstanceCache( 'defaults' );
 			$delay = $session->delaySave();
@@ -3874,7 +3876,13 @@ class User implements IDBAccessObject {
 			$session->setUser( new User );
 			$session->set( 'wsUserID', 0 ); // Other code expects this
 			ScopedCallback::consume( $delay );
+			$error = false;
 		}
+		\MediaWiki\Logger\LoggerFactory::getInstance( 'authmanager' )->info( 'Logout', [
+			'event' => 'logout',
+			'successful' => $error === false,
+			'status' => $error ?: 'success',
+		] );
 	}
 
 	/**