Revert r30078 -- formats "txt" and "dbg" dump raw unfiltered text contents into HTML...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 65d6e37..3b18aa9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -463,7 +463,6 @@ Full API documentation is available at http://www.mediawiki.org/wiki/API
 * Added apfilterlanglinks parameter to list=allpages, replacing query.php?what=nolanglinks
 * (bug 12718) Added action=paraminfo module that provides information about API modules and their parameters
 * Added iiurlwidth and iiurlheight parameters to prop=imageinfo
-* Added format=txt and format=dbg, imported from query.php
 * Added uiprop=editcount to meta=userinfo
 
 === Languages updated in 1.12 ===

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index e3d3b9e..8509c61 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -320,8 +320,6 @@ function __autoload($className) {
                'ApiFormatPhp' => 'includes/api/ApiFormatPhp.php',
                'ApiFormatWddx' => 'includes/api/ApiFormatWddx.php',
                'ApiFormatXml' => 'includes/api/ApiFormatXml.php',
-               'ApiFormatTxt' => 'includes/api/ApiFormatTxt.php',
-               'ApiFormatDbg' => 'includes/api/ApiFormatDbg.php',
                'Spyc' => 'includes/api/ApiFormatYaml_spyc.php',
                'ApiFormatYaml' => 'includes/api/ApiFormatYaml.php',
                'ApiHelp' => 'includes/api/ApiHelp.php',

diff --git a/includes/api/ApiFormatDbg.php b/includes/api/ApiFormatDbg.php
deleted file mode 100644 (file)
index 2766125..0000000
--- a/includes/api/ApiFormatDbg.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php\r
-\r
-/*\r
- * Created on Oct 22, 2006\r
- *\r
- * API for MediaWiki 1.8+\r
- *\r
- * Copyright (C) 2008 Roan Kattouw <Firstname>.<Lastname>@home.nl\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License along\r
- * with this program; if not, write to the Free Software Foundation, Inc.,\r
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r
- * http://www.gnu.org/copyleft/gpl.html\r
- */\r
-\r
-if (!defined('MEDIAWIKI')) {\r
-       // Eclipse helper - will be ignored in production\r
-       require_once ('ApiFormatBase.php');\r
-}\r
-\r
-/**\r
- * @addtogroup API\r
- */\r
-class ApiFormatDbg extends ApiFormatBase {\r
-\r
-       public function __construct($main, $format) {\r
-               parent :: __construct($main, $format);\r
-       }\r
-\r
-       public function getMimeType() {\r
-               return 'text/html';\r
-       }\r
-\r
-       public function execute() {\r
-               $this->printText(var_export($this->getResultData(), true));\r
-       }\r
-\r
-       protected function getDescription() {\r
-               return 'Output data in PHP\'s var_export() format' . parent :: getDescription();\r
-       }\r
-\r
-       public function getVersion() {\r
-               return __CLASS__ . ': $Id: ApiFormatPhp.php 23531 2007-06-29 01:19:14Z simetrical $';\r
-       }\r
-}\r
-\r

diff --git a/includes/api/ApiFormatTxt.php b/includes/api/ApiFormatTxt.php
deleted file mode 100644 (file)
index 09c6246..0000000
--- a/includes/api/ApiFormatTxt.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php\r
-\r
-/*\r
- * Created on Oct 22, 2006\r
- *\r
- * API for MediaWiki 1.8+\r
- *\r
- * Copyright (C) 2008 Roan Kattouw <Firstname>.<Lastname>@home.nl\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License along\r
- * with this program; if not, write to the Free Software Foundation, Inc.,\r
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r
- * http://www.gnu.org/copyleft/gpl.html\r
- */\r
-\r
-if (!defined('MEDIAWIKI')) {\r
-       // Eclipse helper - will be ignored in production\r
-       require_once ('ApiFormatBase.php');\r
-}\r
-\r
-/**\r
- * @addtogroup API\r
- */\r
-class ApiFormatTxt extends ApiFormatBase {\r
-\r
-       public function __construct($main, $format) {\r
-               parent :: __construct($main, $format);\r
-       }\r
-\r
-       public function getMimeType() {\r
-               return 'text/html';\r
-       }\r
-\r
-       public function execute() {\r
-               $this->printText(print_r($this->getResultData(), true));\r
-       }\r
-\r
-       protected function getDescription() {\r
-               return 'Output data in PHP\'s print_r() format' . parent :: getDescription();\r
-       }\r
-\r
-       public function getVersion() {\r
-               return __CLASS__ . ': $Id: ApiFormatPhp.php 23531 2007-06-29 01:19:14Z simetrical $';\r
-       }\r
-}\r
-\r

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index e60cf25..ce69502 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -89,9 +89,7 @@ class ApiMain extends ApiBase {
                'xmlfm' => 'ApiFormatXml',
                'yaml' => 'ApiFormatYaml',
                'yamlfm' => 'ApiFormatYaml',
-               'rawfm' => 'ApiFormatJson',
-               'txt' => 'ApiFormatTxt',
-               'dbg' => 'ApiFormatDbg'
+               'rawfm' => 'ApiFormatJson'
        );
 
        private $mPrinter, $mModules, $mModuleNames, $mFormats, $mFormatNames;