From 4e2b0c90b42263443d87b0d66b606bac84fbda8f Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 30 Jul 2008 04:13:30 +0000 Subject: [PATCH] The documented setting on MW.org (and in DefaultSettings) is $wgSearchForwardUrl, so tweaked Special:Search to use the newer (and better) titled setting. Should make it actually work as advertised now. --- RELEASE-NOTES | 2 ++ includes/specials/SpecialSearch.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e1280f440c..f2a62091eb 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -23,6 +23,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * $wgExemptFromUserRobotsControl is an array of namespaces to be exempt from the effect of the new __INDEX__/__NOINDEX__ magic words. (Default: null, ex- empt all content namespaces.) +* $wgForwardSearchUrl has been removed entirely. Documented setting since 1.4 + has been $wgSearchForwardUrl. === New features in 1.14 === diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index f372320511..1a1fc3fcfb 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -139,9 +139,9 @@ class SpecialSearch { global $wgDisableTextSearch; if ( $wgDisableTextSearch ) { - global $wgForwardSearchUrl; - if( $wgForwardSearchUrl ) { - $url = str_replace( '$1', urlencode( $term ), $wgForwardSearchUrl ); + global $wgSearchForwardUrl; + if( $wgSearchForwardUrl ) { + $url = str_replace( '$1', urlencode( $term ), $wgSearchForwardUrl ); $wgOut->redirect( $url ); return; } -- 2.20.1