X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fskins%2FSkinFactory.php;h=ffbe6293f8ea61230dad3832acc261835795eae2;hb=0128cea1496a68b4fbed206e257d6da43a5391ab;hp=64480884b768d0c55be92766f82362bdb2b273b7;hpb=7cf98015746d96c371133451a4c5ff3c65faeef1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/skins/SkinFactory.php b/includes/skins/SkinFactory.php
index 64480884b7..ffbe6293f8 100644
--- a/includes/skins/SkinFactory.php
+++ b/includes/skins/SkinFactory.php
@@ -40,13 +40,6 @@ class SkinFactory {
 	 * @var array
 	 */
 	private $displayNames = array();
-	/**
-	 * Map of name => class name without "Skin" prefix, for legacy skins using the autodiscovery
-	 * mechanism
-	 *
-	 * @var array
-	 */
-	private $legacySkins = array();
 
 	/**
 	 * @var SkinFactory
@@ -70,7 +63,7 @@ class SkinFactory {
 	 *     to be, but doing so would change the case of i18n message keys).
 	 * @param string $displayName For backwards-compatibility with old skin loading system. This is
 	 *     the text used as skin's human-readable name when the 'skinname-<skin>' message is not
-   *     available. It should be the same as the skin name provided in $wgExtensionCredits.
+	 *     available. It should be the same as the skin name provided in $wgExtensionCredits.
 	 * @param callable $callback Callback that takes the skin name as an argument
 	 * @throws InvalidArgumentException If an invalid callback is provided
 	 */
@@ -82,66 +75,6 @@ class SkinFactory {
 		$this->displayNames[$name] = $displayName;
 	}
 
-	/**
-	 * @return array
-	 */
-	private function getLegacySkinNames() {
-		static $skinsInitialised = false;
-
-		if ( !$skinsInitialised || !count( $this->legacySkins ) ) {
-			# Get a list of available skins
-			# Build using the regular expression '^(.*).php$'
-			# Array keys are all lower case, array value keep the case used by filename
-			#
-			wfProfileIn( __METHOD__ . '-init' );
-
-			global $wgStyleDirectory;
-
-			$skinDir = dir( $wgStyleDirectory );
-
-			if ( $skinDir !== false && $skinDir !== null ) {
-				# while code from www.php.net
-				while ( false !== ( $file = $skinDir->read() ) ) {
-					// Skip non-PHP files, hidden files, and '.dep' includes
-					$matches = array();
-
-					if ( preg_match( '/^([^.]*)\.php$/', $file, $matches ) ) {
-						$aSkin = $matches[1];
-
-						// Explicitly disallow loading core skins via the autodiscovery mechanism.
-						//
-						// They should be loaded already (in a non-autodicovery way), but old files might still
-						// exist on the server because our MW version upgrade process is widely documented as
-						// requiring just copying over all files, without removing old ones.
-						//
-						// This is one of the reasons we should have never used autodiscovery in the first
-						// place. This hack can be safely removed when autodiscovery is gone.
-						if ( in_array( $aSkin, array( 'CologneBlue', 'Modern', 'MonoBook', 'Vector' ) ) ) {
-							wfLogWarning(
-								"An old copy of the $aSkin skin was found in your skins/ directory. " .
-								"You should remove it to avoid problems in the future." .
-								"See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for details."
-							);
-							continue;
-						}
-
-						wfLogWarning(
-							"A skin using autodiscovery mechanism, $aSkin, was found in your skins/ directory. " .
-							"The mechanism will be removed in MediaWiki 1.25 and the skin will no longer be recognized. " .
-							"See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for information how to fix this."
-						);
-						$this->legacySkins[strtolower( $aSkin )] = $aSkin;
-					}
-				}
-				$skinDir->close();
-			}
-			$skinsInitialised = true;
-			wfProfileOut( __METHOD__ . '-init' );
-		}
-		return $this->legacySkins;
-
-	}
-
 	/**
 	 * Returns an associative array of:
 	 *  skin name => human readable name
@@ -149,43 +82,7 @@ class SkinFactory {
 	 * @return array
 	 */
 	public function getSkinNames() {
-		return array_merge(
-			$this->getLegacySkinNames(),
-			$this->displayNames
-		);
-	}
-
-	/**
-	 * Get a legacy skin which uses the autodiscovery mechanism.
-	 *
-	 * @param string $name
-	 * @return Skin|bool False if the skin couldn't be constructed
-	 */
-	private function getLegacySkin( $name ) {
-		$skinNames = $this->getLegacySkinNames();
-		if ( !isset( $skinNames[$name] ) ) {
-			return false;
-		}
-		$skinName = $skinNames[$name];
-		$className = "Skin{$skinName}";
-
-		# Grab the skin class and initialise it.
-		if ( !class_exists( $className ) ) {
-			global $wgStyleDirectory;
-			require_once "{$wgStyleDirectory}/{$skinName}.php";
-
-			# Check if we got it
-			if ( !class_exists( $className ) ) {
-				# DO NOT die if the class isn't found. This breaks maintenance
-				# scripts and can cause a user account to be unrecoverable
-				# except by SQL manipulation if a previously valid skin name
-				# is no longer valid.
-				return false;
-			}
-		}
-		$skin = new $className( $name );
-		return $skin;
-
+		return $this->displayNames;
 	}
 
 	/**
@@ -197,11 +94,6 @@ class SkinFactory {
 	 */
 	public function makeSkin( $name ) {
 		if ( !isset( $this->factoryFunctions[$name] ) ) {
-			// Check the legacy autodiscovery method of skin loading
-			$legacy = $this->getLegacySkin( $name );
-			if ( $legacy ) {
-				return $legacy;
-			}
 			throw new SkinException( "No registered builder available for $name." );
 		}
 		$skin = call_user_func( $this->factoryFunctions[$name], $name );