From 55c96b6ca3e8f97feee62906c4b85586d6d7f057 Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Fri, 9 Jul 2010 09:46:05 +0000 Subject: [PATCH] Revert r64436, r64437, r64508 per CR r64436 --- RELEASE-NOTES | 1 - includes/AutoLoader.php | 1 - includes/api/ApiGo.php | 95 ---------------------------------------- includes/api/ApiMain.php | 1 - 4 files changed, 98 deletions(-) delete mode 100644 includes/api/ApiGo.php diff --git a/RELEASE-NOTES b/RELEASE-NOTES index a64887742b..805ee6e96d 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -238,7 +238,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 22738) Allow filtering by action type on query=logevent. * (bug 22764) uselang parameter for action=parse. * (bug 22944) API: watchlist options are inconsistent. -* (bug 22339) "Go" result should be available through the API. * (bug 22868) don't list infinite block expiry date as "now" in API logevents. * (bug 22290) prop=revisions now outputs "comment" field even when comment. is empty, for consistency with list=recentchanges. diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 0f0d36ee09..64f57e8a32 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -262,7 +262,6 @@ $wgAutoloadLocalClasses = array( 'ApiFormatWddx' => 'includes/api/ApiFormatWddx.php', 'ApiFormatXml' => 'includes/api/ApiFormatXml.php', 'ApiFormatYaml' => 'includes/api/ApiFormatYaml.php', - 'ApiGo' => 'includes/api/ApiGo.php', 'ApiHelp' => 'includes/api/ApiHelp.php', 'ApiImport' => 'includes/api/ApiImport.php', 'ApiImportReporter' => 'includes/api/ApiImport.php', diff --git a/includes/api/ApiGo.php b/includes/api/ApiGo.php deleted file mode 100644 index ca53631e36..0000000000 --- a/includes/api/ApiGo.php +++ /dev/null @@ -1,95 +0,0 @@ -.@btinternet.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - */ - -if ( !defined( 'MEDIAWIKI' ) ) { - // Eclipse helper - will be ignored in production - require_once( "ApiBase.php" ); -} - -/** -* API module to determine the result of a "Go" search -* - * @ingroup API - */ -class ApiGo extends ApiBase { - public function __construct( $main, $action ) { - parent::__construct( $main, $action ); - } - - public function execute() { - $params = $this->extractRequestParams(); - $text = $params['text']; - - if ( is_null( $text ) ) { - $this->dieUsageMsg( array( 'missingparam', 'text' ) ); - } - - // Strip underscores - $text = str_replace( '_', ' ', $text ); - - $nearMatch = SearchEngine::getNearMatch( $text ); - - $this->getResult()->addValue( null, $this->getModuleName(), array( 'text' => $text, 'result' => $nearMatch ) ); - } - - public function mustBePosted() { - return false; - } - - public function isWriteMode() { - return false; - } - - public function getAllowedParams() { - return array( - 'text' => null, - ); - } - - public function getParamDescription() { - return array( - 'text' => 'Text to try a "Go" match for' - ); - } - - public function getDescription() { - return 'Determine the title one will be taken to by a "Go" search, if any'; - } - - public function getPossibleErrors() { - return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'text' ) - ) ); - } - - protected function getExamples() { - return array( - 'api.php?action=go&text=Foo' - ); - } - - public function getVersion() { - return __CLASS__ . ': $Id$'; - } -} diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index d183939567..260be900eb 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -63,7 +63,6 @@ class ApiMain extends ApiBase { 'parse' => 'ApiParse', 'opensearch' => 'ApiOpenSearch', 'feedwatchlist' => 'ApiFeedWatchlist', - 'go' => 'ApiGo', 'help' => 'ApiHelp', 'paraminfo' => 'ApiParamInfo', -- 2.20.1