X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=languages%2FLanguageConverter.php;h=bb5b49fd62ec49c9d2f06c920ea97928830ebdb3;hb=eb341401bc466c9f988ae862ecfd15366b3813a9;hp=cdaab2ce7b6d111b8941ee03a0b52b7eb2722780;hpb=00a9c3e928d27d8b1a4deb828411d574fd390556;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index cdaab2ce7b..bb5b49fd62 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -236,7 +236,8 @@ class LanguageConverter {
 			$ret = $wgRequest->getVal( 'uselang' );
 		}
 
-		return $this->mURLVariant = $this->validateVariant( $ret );
+		$this->mURLVariant = $this->validateVariant( $ret );
+		return $this->mURLVariant;
 	}
 
 	/**
@@ -269,7 +270,8 @@ class LanguageConverter {
 			$ret = $wgUser->getOption( 'language' );
 		}
 
-		return $this->mUserVariant = $this->validateVariant( $ret );
+		$this->mUserVariant = $this->validateVariant( $ret );
+		return $this->mUserVariant;
 	}
 
 	/**
@@ -489,21 +491,6 @@ class LanguageConverter {
 		return $ret;
 	}
 
-	/**
-	 * Convert link text to all valid variants.
-	 * In the first, this function only convert text outside the
-	 * "-{" "}-" markups. Since the "{" and "}" are not allowed in
-	 * titles, the text will get all converted always.
-	 * So I removed this feature and deprecated the function.
-	 *
-	 * @param $text String: the text to be converted
-	 * @return Array: variant => converted text
-	 * @deprecated since 1.17 Use autoConvertToAllVariants() instead
-	 */
-	public function convertLinkToAllVariants( $text ) {
-		return $this->autoConvertToAllVariants( $text );
-	}
-
 	/**
 	 * Apply manual conversion rules.
 	 *