Merge "Fix variable name and use isset() to shut up a stupid notice"

[lhc/web/wiklou.git] / includes / api / ApiFormatDbg.php

diff --git a/includes/api/ApiFormatDbg.php b/includes/api/ApiFormatDbg.php
index 1b2e02c..7d359ad 100644 (file)
--- a/includes/api/ApiFormatDbg.php
+++ b/includes/api/ApiFormatDbg.php
@@ -26,6 +26,7 @@
 
 /**
  * API PHP's var_export() output formatter
+ * @deprecated since 1.24
  * @ingroup API
  */
 class ApiFormatDbg extends ApiFormatBase {
@@ -38,10 +39,16 @@ class ApiFormatDbg extends ApiFormatBase {
        }
 
        public function execute() {
-               $this->printText( var_export( $this->getResultData(), true ) );
+               $this->markDeprecated();
+               $data = $this->getResult()->getResultData( null, array(
+                       'BC' => array(),
+                       'Types' => array(),
+                       'Strip' => 'all',
+               ) );
+               $this->printText( var_export( $data, true ) );
        }
 
-       public function getDescription() {
-               return 'Output data in PHP\'s var_export() format' . parent::getDescription();
+       public function isDeprecated() {
+               return true;
        }
 }