Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 8 insertions, 3 deletions

diff --git a/includes/api/ApiFormatDump.php b/includes/api/ApiFormatDump.php
index d4c7cab4..f34e1ae4 100644
--- a/includes/api/ApiFormatDump.php
+++ b/includes/api/ApiFormatDump.php
@@ -40,14 +40,19 @@ class ApiFormatDump extends ApiFormatBase {
 
 	public function execute() {
 		$this->markDeprecated();
+		$data = $this->getResult()->getResultData( null, array(
+			'BC' => array(),
+			'Types' => array(),
+			'Strip' => 'all',
+		) );
 		ob_start();
-		var_dump( $this->getResultData() );
+		var_dump( $data );
 		$result = ob_get_contents();
 		ob_end_clean();
 		$this->printText( $result );
 	}
 
-	public function getDescription() {
-		return 'DEPRECATED! Output data in PHP\'s var_dump() format' . parent::getDescription();
+	public function isDeprecated() {
+		return true;
 	}
 }