(bug 22940) Namespace aliases to the main namespace don't work. Patch by quietust

diff --git a/CREDITS b/CREDITS
index 27ec75f..31403d6 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -110,6 +110,7 @@ following names for their contribution to the product.
 * Olaf Lenz
 * Paul Copperman
 * PieRRoMaN
+* quietust
 * René Kijewski
 * Robert Treat
 * RockMFR

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a3333a..02346e3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -57,6 +57,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 19270) Relative URIs in interwiki links break interwiki transclusion
 * (bug 22903) Revdelete log entries now show in the user preferred language.
 * (bug 22905) Correctly handle <abbr> followed by ISBN
+* (bug 22940) Namespace aliases pointing to main namespace don't work
 
 == API changes in 1.17 ==
 * (bug 22738) Allow filtering by action type on query=logevent

diff --git a/includes/Title.php b/includes/Title.php
index 011f21a..ea5373c 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2440,7 +2440,7 @@ class Title {
                        $m = array();
                        if ( preg_match( $prefixRegexp, $dbkey, $m ) ) {
                                $p = $m[1];
-                               if ( $ns = $wgContLang->getNsIndex( $p ) ) {
+                               if ( ( $ns = $wgContLang->getNsIndex( $p ) ) !== false ) {
                                        # Ordinary namespace
                                        $dbkey = $m[2];
                                        $this->mNamespace = $ns;