X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguage.php;h=fdea3d8e0cb963451fd1245bff4c86df82a19d99;hb=250da851d1ab6d01a7c53a6e947b699e54b4b470;hp=e6feb45edf10375b82ab67d52d17482051628734;hpb=37b46ae357fcb7a382d5f67a9682763739483a87;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index e6feb45edf..fdea3d8e0c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -245,6 +245,17 @@ class Language {
 	 * @return bool
 	 */
 	public static function isValidBuiltInCode( $code ) {
+
+		if( !is_string($code) ) {
+			$type = gettype( $code );
+			if( $type === 'object' ) {
+				$addmsg = " of class " . get_class( $code );
+			} else {
+				$addmsg = '';
+			}
+			throw new MWException( __METHOD__ . " must be passed a string, $type given$addmsg" );
+		}
+
 		return preg_match( '/^[a-z0-9-]+$/i', $code );
 	}
 
@@ -392,6 +403,16 @@ class Language {
 	 */
 	public function setNamespaces( array $namespaces ) {
 		$this->namespaceNames = $namespaces;
+		$this->mNamespaceIds = null;
+	}
+
+	/**
+	 * Resets all of the namespace caches. Mainly used for testing
+	 */
+	public function resetNamespaces( ) {
+		$this->namespaceNames = null;
+		$this->mNamespaceIds = null;
+		$this->namespaceAliases = null;
 	}
 
 	/**
@@ -700,9 +721,9 @@ class Language {
 	 *		Use null for autonyms (native names)
 	 * @param $include string:
 	 *		'all' all available languages
-	 *		'mw' only if the language is defined in MediaWiki or wgExtraLanguageNames
+	 *		'mw' only if the language is defined in MediaWiki or wgExtraLanguageNames (default)
 	 *		'mwfile' only if the language is in 'mw' *and* has a message file
-	 * @return array|bool: language code => language name, false if $include is wrong
+	 * @return array: language code => language name
 	 * @since 1.20
 	 */
 	public static function fetchLanguageNames( $inLanguage = null, $include = 'mw' ) {
@@ -740,9 +761,7 @@ class Language {
 			$returnMw[$coreCode] = $names[$coreCode];
 		}
 
-		if( $include === 'mw' ) {
-			return $returnMw;
-		} elseif( $include === 'mwfile' ) {
+		if( $include === 'mwfile' ) {
 			$namesMwFile = array();
 			# We do this using a foreach over the codes instead of a directory
 			# loop so that messages files in extensions will work correctly.
@@ -753,7 +772,8 @@ class Language {
 			}
 			return $namesMwFile;
 		}
-		return false;
+		# 'mw' option; default if it's not one of the other two options (all/mwfile)
+		return $returnMw;
 	}
 
 	/**
@@ -2708,12 +2728,26 @@ class Language {
 	}
 
 	/**
-	 * An arrow, depending on the language direction
+	 * An arrow, depending on the language direction.
 	 *
+	 * @param $direction String: the direction of the arrow: forwards (default), backwards, left, right, up, down.
 	 * @return string
 	 */
-	function getArrow() {
-		return $this->isRTL() ? '←' : '→';
+	function getArrow( $direction = 'forwards' ) {
+		switch ( $direction ) {
+		case 'forwards':
+			return $this->isRTL() ? '←' : '→';
+		case 'backwards':
+			return $this->isRTL() ? '→' : '←';
+		case 'left':
+			return '←';
+		case 'right':
+			return '→';
+		case 'up':
+			return '↑';
+		case 'down':
+			return '↓';
+		}
 	}
 
 	/**