From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 includes/api/ApiFormatDbg.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'includes/api/ApiFormatDbg.php')

diff --git a/includes/api/ApiFormatDbg.php b/includes/api/ApiFormatDbg.php
index 5ec518b3..7d359ad4 100644
--- a/includes/api/ApiFormatDbg.php
+++ b/includes/api/ApiFormatDbg.php
@@ -40,10 +40,15 @@ class ApiFormatDbg extends ApiFormatBase {
 
 	public function execute() {
 		$this->markDeprecated();
-		$this->printText( var_export( $this->getResultData(), true ) );
+		$data = $this->getResult()->getResultData( null, array(
+			'BC' => array(),
+			'Types' => array(),
+			'Strip' => 'all',
+		) );
+		$this->printText( var_export( $data, true ) );
 	}
 
-	public function getDescription() {
-		return 'DEPRECATED! Output data in PHP\'s var_export() format' . parent::getDescription();
+	public function isDeprecated() {
+		return true;
 	}
 }
-- 
cgit v1.2.3-54-g00ecf