X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialMyLanguage.php;h=3d8ff97bb2ef8e8d8fb95d2ebc1d9c10b9554389;hb=6b1a173f07f1a04188735f4688ce6335da14c3b7;hp=6cea15818cb9bb92a8eaae0fa20c5bfa1b32e476;hpb=26a86825575e7c85797f64a3c02e3e8cb21fe855;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialMyLanguage.php b/includes/specials/SpecialMyLanguage.php
index 6cea15818c..3d8ff97bb2 100644
--- a/includes/specials/SpecialMyLanguage.php
+++ b/includes/specials/SpecialMyLanguage.php
@@ -41,11 +41,11 @@ class SpecialMyLanguage extends RedirectSpecialArticle {
 	 * If the special page is a redirect, then get the Title object it redirects to.
 	 * False otherwise.
 	 *
-	 * @param string $par Subpage string
-	 * @return Title|bool
+	 * @param string|null $subpage
+	 * @return Title
 	 */
-	public function getRedirect( $par ) {
-		$title = $this->findTitle( $par );
+	public function getRedirect( $subpage ) {
+		$title = $this->findTitle( $subpage );
 		// Go to the main page if given invalid title.
 		if ( !$title ) {
 			$title = Title::newMainPage();
@@ -59,18 +59,22 @@ class SpecialMyLanguage extends RedirectSpecialArticle {
 	 * it returns Page/fi if it exists, otherwise Page/de if it exists,
 	 * otherwise Page.
 	 *
-	 * @param string $par
+	 * @param string|null $subpage
 	 * @return Title|null
 	 */
-	public function findTitle( $par ) {
+	public function findTitle( $subpage ) {
 		// base = title without language code suffix
 		// provided = the title as it was given
-		$base = $provided = Title::newFromText( $par );
+		$base = $provided = null;
+		if ( $subpage !== null ) {
+			$provided = Title::newFromText( $subpage );
+			$base = $provided;
+		}
 
-		if ( $base && strpos( $par, '/' ) !== false ) {
-			$pos = strrpos( $par, '/' );
-			$basepage = substr( $par, 0, $pos );
-			$code = substr( $par, $pos + 1 );
+		if ( $provided && strpos( $subpage, '/' ) !== false ) {
+			$pos = strrpos( $subpage, '/' );
+			$basepage = substr( $subpage, 0, $pos );
+			$code = substr( $subpage, $pos + 1 );
 			if ( strlen( $code ) && Language::isKnownLanguageTag( $code ) ) {
 				$base = Title::newFromText( $basepage );
 			}