| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1645,12 +1645,7 @@ |
| 1646 | 1646 | $m = array(); |
| 1647 | 1647 | if ( preg_match( "/^(.+?)_*:_*(.*)$/S", $dbkey, $m ) ) { |
| 1648 | 1648 | $p = $m[1]; |
| 1649 | | - $lowerNs = $wgContLang->lc( $p ); |
| 1650 | | - if ( $ns = Namespace::getCanonicalIndex( $lowerNs ) ) { |
| 1651 | | - # Canonical namespace |
| 1652 | | - $dbkey = $m[2]; |
| 1653 | | - $this->mNamespace = $ns; |
| 1654 | | - } elseif ( $ns = $wgContLang->getNsIndex( $lowerNs )) { |
| | 1649 | + if ( $ns = $wgContLang->getNsIndex( $p )) { |
| 1655 | 1650 | # Ordinary namespace |
| 1656 | 1651 | $dbkey = $m[2]; |
| 1657 | 1652 | $this->mNamespace = $ns; |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -228,15 +228,33 @@ |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | /** |
| 232 | | - * Get a namespace key by value, case insensetive. |
| | 232 | + * Get a namespace key by value, case insensitive. |
| | 233 | + * Only matches namespace names for the current language, not the |
| | 234 | + * canonical ones defined in Namespace.php. |
| 233 | 235 | * |
| 234 | 236 | * @param string $text |
| 235 | 237 | * @return mixed An integer if $text is a valid value otherwise false |
| 236 | 238 | */ |
| | 239 | + function getLocalNsIndex( $text ) { |
| | 240 | + $this->load(); |
| | 241 | + $lctext = $this->lc($text); |
| | 242 | + if( ( $ns = $this->mNamespaceIds[$lctext] ) !== null ) return $ns; |
| | 243 | + return false; |
| | 244 | + } |
| | 245 | + |
| | 246 | + /** |
| | 247 | + * Get a namespace key by value, case insensitive. Canonical namespace |
| | 248 | + * names override custom ones defined for the current language. |
| | 249 | + * |
| | 250 | + * @param string $text |
| | 251 | + * @return mixed An integer if $text is a valid value otherwise false |
| | 252 | + */ |
| 237 | 253 | function getNsIndex( $text ) { |
| 238 | 254 | $this->load(); |
| 239 | 255 | $lctext = $this->lc($text); |
| 240 | | - return isset( $this->mNamespaceIds[$lctext] ) ? $this->mNamespaceIds[$lctext] : false; |
| | 256 | + if( ( $ns = Namespace::getCanonicalIndex( $lctext ) ) !== null ) return $ns; |
| | 257 | + if( ( $ns = $this->mNamespaceIds[$lctext] ) !== null ) return $ns; |
| | 258 | + return false; |
| 241 | 259 | } |
| 242 | 260 | |
| 243 | 261 | /** |