* Copy fix for old search URLs with Lucene search plugin from REL1_4

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0aa3089..23fa83b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -431,6 +431,7 @@ Various bugfixes, small features, and a few experimental things:
   categories only if the page does not exist.
 * (bug 2625) Keep group & user settings when paging in Listusers
 * (bug 2627) Fix regression: diff radio button initial selection
+* Copy fix for old search URLs with Lucene search plugin from REL1_4
 
 
 === Caveats ===

diff --git a/index.php b/index.php
index 8f6fc3b..7b61ddf 100644 (file)
--- a/index.php
+++ b/index.php
@@ -103,8 +103,11 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( 'main-action' );
-
 $search = $wgRequest->getText( 'search' );
+if( $wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
+       $wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
+}
+
 if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        require_once( 'includes/SpecialSearch.php' );
        $wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );