From: River Tarnell <kateturner@users.mediawiki.org>
Date: Tue, 21 Dec 2004 09:28:57 +0000 (+0000)
Subject: $wgDisableInternalSearch
X-Git-Tag: 1.5.0alpha1~1068
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=b88747bf3ddd53ea322d2d3b3d548a04de1bde67;p=lhc%2Fweb%2Fwiklou.git

$wgDisableInternalSearch
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e5805e8af7..bf7f45d7e4 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -980,7 +980,13 @@ $wgHooks = array();
  * Leave disabled unless you're testing it.
  */
 $wgLivePreview = false;
-	
+
+/**
+ * Disable the internal MySQL-based search, to allow it to be
+ * implemented by an extension instead.
+ */
+$wgDisableInternalSearch = false;
+
 } else {
 	die();
 }
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index c61c7db17a..d593c33a03 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -55,6 +55,11 @@ if ( $wgUseData ) {
 	$wgSpecialPages['Data'] = new SpecialPage( 'Data' );
 }
 
+global $wgDisableInternalSearch;
+if( !$wgDisableInternalSearch ) {
+	$wgSpecialPages['Search'] = new UnlistedSpecialPage( 'Search' );
+}
+
 $wgSpecialPages = array_merge($wgSpecialPages, array (
 	'Wantedpages'	=> new SpecialPage( 'Wantedpages' ),
 	'Shortpages'	=> new SpecialPage( 'Shortpages' ),
@@ -79,7 +84,6 @@ $wgSpecialPages = array_merge($wgSpecialPages, array (
 	'Export'		=> new SpecialPage( 'Export' ),
 	'Version'		=> new SpecialPage( 'Version' ),
 	'Allmessages'	=> new SpecialPage( 'Allmessages' ),
-	'Search'		=> new UnlistedSpecialPage( 'Search' ),
 	'Log'           => new SpecialPage( 'Log' ),
 	'Blockip'		=> new SpecialPage( 'Blockip', 'block' ),
 	'Asksql'		=> new SpecialPage( 'Asksql', 'asksql' ),
diff --git a/index.php b/index.php
index 5486408c2e..7f58774df8 100644
--- a/index.php
+++ b/index.php
@@ -59,8 +59,9 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( "main-action" );
+
 $search = $wgRequest->getText( 'search' );
-if( !is_null( $search ) && $search !== '' ) {
+if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
 	require_once( 'includes/SpecialSearch.php' );
 	$wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
 	wfSpecialSearch();