X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fspecialpage%2FSpecialPageFactory.php;h=013ceb24e5afca2bd015f51ef6f52ab3f0f90672;hp=c6ffbe4d70ae1d47d5a7cb0481d76867b793dc90;hb=0f65db0f2a5e40e17474b9dfea1d0516e697dd5b;hpb=1504dea1127a5f7960dcdc4eed5a044f6a962deb

diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index c6ffbe4d70..013ceb24e5 100644
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -34,7 +34,6 @@ use RequestContext;
 use SpecialPage;
 use Title;
 use User;
-use Wikimedia\ObjectFactory;
 
 /**
  * Factory for handling the special page list and generating SpecialPage objects.
@@ -401,16 +400,6 @@ class SpecialPageFactory {
 			} elseif ( is_string( $rec ) ) {
 				$className = $rec;
 				$page = new $className;
-			} elseif ( is_array( $rec ) ) {
-				$className = array_shift( $rec );
-				// @deprecated, officially since 1.18, unofficially since forever
-				wfDeprecated( "Array syntax for \$wgSpecialPages is deprecated ($className), " .
-					"define a subclass of SpecialPage instead.", '1.18' );
-				$page = ObjectFactory::getObjectFromSpec( [
-					'class' => $className,
-					'args' => $rec,
-					'closure_expansion' => false,
-				] );
 			} elseif ( $rec instanceof SpecialPage ) {
 				$page = $rec; // XXX: we should deep clone here
 			} else {
@@ -419,16 +408,14 @@ class SpecialPageFactory {
 
 			if ( $page instanceof SpecialPage ) {
 				return $page;
-			} else {
-				// It's not a classname, nor a callback, nor a legacy constructor array,
-				// nor a special page object. Give up.
-				wfLogWarning( "Cannot instantiate special page $realName: bad spec!" );
-				return null;
 			}
 
-		} else {
-			return null;
+			// It's not a classname, nor a callback, nor a legacy constructor array,
+			// nor a special page object. Give up.
+			wfLogWarning( "Cannot instantiate special page $realName: bad spec!" );
 		}
+
+		return null;
 	}
 
 	/**
@@ -565,9 +552,9 @@ class SpecialPageFactory {
 				$context->getOutput()->redirect( $url );
 
 				return $title;
-			} else {
-				$context->setTitle( $page->getPageTitle( $par ) );
 			}
+
+			$context->setTitle( $page->getPageTitle( $par ) );
 		} elseif ( !$page->isIncludable() ) {
 			return false;
 		}
@@ -714,8 +701,8 @@ class SpecialPageFactory {
 		list( $name, $subpage ) = $this->resolveAlias( $alias );
 		if ( $name != null ) {
 			return SpecialPage::getTitleFor( $name, $subpage );
-		} else {
-			return null;
 		}
+
+		return null;
 	}
 }