From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/api/ApiFormatWddx.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'includes/api/ApiFormatWddx.php') diff --git a/includes/api/ApiFormatWddx.php b/includes/api/ApiFormatWddx.php index 5685d937..ba90c260 100644 --- a/includes/api/ApiFormatWddx.php +++ b/includes/api/ApiFormatWddx.php @@ -26,6 +26,7 @@ /** * API WDDX output formatter + * @deprecated since 1.24 * @ingroup API */ class ApiFormatWddx extends ApiFormatBase { @@ -35,13 +36,17 @@ class ApiFormatWddx extends ApiFormatBase { } public function execute() { + $this->markDeprecated(); + // Some versions of PHP have a broken wddx_serialize_value, see // PHP bug 45314. Test encoding an affected character (U+00A0) // to avoid this. - $expected = "
\xc2\xa0"; + $expected = + "
\xc2\xa0"; if ( function_exists( 'wddx_serialize_value' ) - && !$this->getIsHtml() - && wddx_serialize_value( "\xc2\xa0" ) == $expected ) { + && !$this->getIsHtml() + && wddx_serialize_value( "\xc2\xa0" ) == $expected + ) { $this->printText( wddx_serialize_value( $this->getResultData() ) ); } else { // Don't do newlines and indentation if we weren't asked @@ -60,8 +65,8 @@ class ApiFormatWddx extends ApiFormatBase { /** * Recursively go through the object and output its data in WDDX format. - * @param $elemValue - * @param $indent int + * @param mixed $elemValue + * @param int $indent */ function slowWddxPrinter( $elemValue, $indent = 0 ) { $indstr = ( $this->getIsHtml() ? str_repeat( ' ', $indent ) : '' ); @@ -105,6 +110,6 @@ class ApiFormatWddx extends ApiFormatBase { } public function getDescription() { - return 'Output data in WDDX format' . parent::getDescription(); + return 'DEPRECATED! Output data in WDDX format' . parent::getDescription(); } } -- cgit v1.2.3-54-g00ecf