| Index: trunk/extensions/DataTransfer/specials/DT_ViewXML.php |
| — | — | @@ -405,13 +405,13 @@ |
| 406 | 406 | } |
| 407 | 407 | |
| 408 | 408 | function doSpecialViewXML() { |
| 409 | | - global $wgOut, $wgRequest, $wgUser, $wgCanonicalNamespaceNames, $wgContLang; |
| | 409 | + global $wgOut, $wgRequest, $wgUser, $wgContLang; |
| 410 | 410 | $skin = $wgUser->getSkin(); |
| 411 | 411 | $namespace_labels = $wgContLang->getNamespaces(); |
| 412 | 412 | $category_label = $namespace_labels[NS_CATEGORY]; |
| 413 | 413 | $template_label = $namespace_labels[NS_TEMPLATE]; |
| 414 | 414 | $name_str = str_replace( ' ', '_', wfMsgForContent( 'dt_xml_name' ) ); |
| 415 | | - $namespace_str = wfMsg( 'dt_xml_namespace' ); |
| | 415 | + $namespace_str = str_replace( ' ', '_', wfMsg( 'dt_xml_namespace' ) ); |
| 416 | 416 | $pages_str = str_replace( ' ', '_', wfMsgForContent( 'dt_xml_pages' ) ); |
| 417 | 417 | |
| 418 | 418 | $form_submitted = false; |
| — | — | @@ -455,7 +455,7 @@ |
| 456 | 456 | if ( $ns == 0 ) { |
| 457 | 457 | $ns_name = "Main"; |
| 458 | 458 | } else { |
| 459 | | - $ns_name = $wgCanonicalNamespaceNames[$ns]; |
| | 459 | + $ns_name = MWNamespace::getCanonicalName( $ns ); |
| 460 | 460 | } |
| 461 | 461 | if ( $simplified_format ) |
| 462 | 462 | $text .= '<' . str_replace( ' ', '_', $ns_name ) . ">\n"; |
| — | — | @@ -495,9 +495,9 @@ |
| 496 | 496 | $namespaces = getNamespacesList(); |
| 497 | 497 | foreach ( $namespaces as $namespace ) { |
| 498 | 498 | if ( $namespace == 0 ) { |
| 499 | | - $ns_name = "Main"; |
| | 499 | + $ns_name = wfMsgHtml( 'blanknamespace' ); |
| 500 | 500 | } else { |
| 501 | | - $ns_name = $wgCanonicalNamespaceNames["$namespace"]; |
| | 501 | + $ns_name = htmlspecialchars( $wgContLang->getFormattedNsText( $namespace ) ); |
| 502 | 502 | } |
| 503 | 503 | $ns_name = str_replace( '_', ' ', $ns_name ); |
| 504 | 504 | $text .= "<input type=\"checkbox\" name=\"namespaces[$namespace]\" /> $ns_name <br />\n"; |