From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 21 Jul 2015 11:11:26 +0000 (+0000)
Subject: Merge "tiny optimization Title::isValidRedirectTarget()"
X-Git-Tag: 1.31.0-rc.0~10694
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=6b1a173f07f1a04188735f4688ce6335da14c3b7;hp=e77a09ccdbf367c78ebbdc0f846f8698d021c070;p=lhc%2Fweb%2Fwiklou.git

Merge "tiny optimization Title::isValidRedirectTarget()"
---

diff --git a/includes/Title.php b/includes/Title.php
index fac45d0c7a..8a15b541d7 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4547,15 +4547,17 @@ class Title {
 	public function isValidRedirectTarget() {
 		global $wgInvalidRedirectTargets;
 
-		// invalid redirect targets are stored in a global array, but explicitly disallow Userlogout here
-		if ( $this->isSpecial( 'Userlogout' ) ) {
-			return false;
-		}
-
-		foreach ( $wgInvalidRedirectTargets as $target ) {
-			if ( $this->isSpecial( $target ) ) {
+		if ( $this->isSpecialPage() ) {
+			// invalid redirect targets are stored in a global array, but explicitly disallow Userlogout here
+			if ( $this->isSpecial( 'Userlogout' ) ) {
 				return false;
 			}
+
+			foreach ( $wgInvalidRedirectTargets as $target ) {
+				if ( $this->isSpecial( $target ) ) {
+					return false;
+				}
+			}
 		}
 
 		return true;