| Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php |
| — | — | @@ -127,7 +127,7 @@ |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | protected function appendNamespaces( $property ) { |
| 131 | | - global $wgContLang; |
| | 131 | + global $wgContLang, $wgCanonicalNamespaceNames; |
| 132 | 132 | $data = array(); |
| 133 | 133 | foreach( $wgContLang->getFormattedNamespaces() as $ns => $title ) |
| 134 | 134 | { |
| — | — | @@ -135,7 +135,7 @@ |
| 136 | 136 | 'id' => $ns |
| 137 | 137 | ); |
| 138 | 138 | ApiResult :: setContent( $data[$ns], $title ); |
| 139 | | - $canonical = Namespace::getCanonicalName( $ns ); |
| | 139 | + $canonical = isset($wgCanonicalNamespaceNames[$ns]) ? $wgCanonicalNamespaceNames[$ns] : false; |
| 140 | 140 | |
| 141 | 141 | if( MWNamespace::hasSubpages( $ns ) ) |
| 142 | 142 | $data[$ns]['subpages'] = ''; |
| — | — | @@ -352,7 +352,7 @@ |
| 353 | 353 | 'prop' => array( |
| 354 | 354 | 'Which sysinfo properties to get:', |
| 355 | 355 | ' "general" - Overall system information', |
| 356 | | - ' "namespaces" - List of registered namespaces (localized)', |
| | 356 | + ' "namespaces" - List of registered namespaces and their canonical names', |
| 357 | 357 | ' "namespacealiases" - List of registered namespace aliases', |
| 358 | 358 | ' "specialpagealiases" - List of special page aliases', |
| 359 | 359 | ' "magicwords" - List of magic words and their aliases', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -233,7 +233,6 @@ |
| 234 | 234 | * (bug 7492) Rights can now be assigned to specific IP addresses and ranges by |
| 235 | 235 | using $wgAutopromote (new defines: APCOND_ISIP and APCOND_IPINRANGE) |
| 236 | 236 | * Add a 'change block' link to Special:IPBlockList and Special:Log |
| 237 | | -* (bug 16672) Add canonical parameter to meta=siteinfo&siprop=namespaces|namespacealiases. |
| 238 | 237 | |
| 239 | 238 | === Bug fixes in 1.14 === |
| 240 | 239 | |
| — | — | @@ -531,6 +530,7 @@ |
| 532 | 531 | * (bug 16647) list=allcategories, prop=categories don't return "hidden" |
| 533 | 532 | property for hidden categories |
| 534 | 533 | * New siprop parameter of 'extensions' to list all installed extensions |
| | 534 | +* (bug 16672) Include canonical namespace name in meta=siteinfo&siprop=namespaces. |
| 535 | 535 | |
| 536 | 536 | === Languages updated in 1.14 === |
| 537 | 537 | |