diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
| commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
| tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/api/ApiFormatXml.php | |
| parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
| parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) | |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/api/ApiFormatXml.php')
| -rw-r--r-- | includes/api/ApiFormatXml.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/includes/api/ApiFormatXml.php b/includes/api/ApiFormatXml.php index fa0bac34..e8ad387b 100644 --- a/includes/api/ApiFormatXml.php +++ b/includes/api/ApiFormatXml.php @@ -39,13 +39,6 @@ class ApiFormatXml extends ApiFormatBase { return 'text/xml'; } - /** - * @deprecated since 1.25 - */ - public function getNeedsRawData() { - return true; - } - public function setRootElement( $rootElemName ) { $this->mRootElemName = $rootElemName; } @@ -72,7 +65,7 @@ class ApiFormatXml extends ApiFormatBase { 'Custom' => function ( &$data, &$metadata ) { if ( isset( $metadata[ApiResult::META_TYPE] ) ) { // We want to use non-BC for BCassoc to force outputting of _idx. - switch( $metadata[ApiResult::META_TYPE] ) { + switch ( $metadata[ApiResult::META_TYPE] ) { case 'BCassoc': $metadata[ApiResult::META_TYPE] = 'assoc'; break; @@ -267,7 +260,7 @@ class ApiFormatXml extends ApiFormatBase { return '_' . preg_replace_callback( "/[^$nc]/uS", function ( $m ) { - return sprintf( '.%X.', utf8ToCodepoint( $m[0] ) ); + return sprintf( '.%X.', UtfNormal\Utils::utf8ToCodepoint( $m[0] ) ); }, str_replace( '.', '.2E.', $name ) ); |