From 4227fa35c279e2a7b1fcfeae96fa0e27866fe741 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 31 Jan 2004 05:02:25 +0000
Subject: [PATCH] Move search check before title canonicalness check so search
 works again

---
 wiki.phtml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wiki.phtml b/wiki.phtml
index fa0374085b..ba5e2821b1 100644
--- a/wiki.phtml
+++ b/wiki.phtml
@@ -52,7 +52,13 @@ if ( "" == $title && "delete" != $action ) {
 }
 wfProfileOut( "main-misc-setup" );
 
-if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
+if ( "" != $search ) {
+	if($go) {
+		wfGo( $search );
+	} else {
+		wfSearch( $search );
+	}
+} else if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
 	$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
 	$wgOut->errorpage( "badtitle", "badtitletext" );
 } else if ( $wgTitle->getPrefixedDBKey() != $title ) {
@@ -60,12 +66,6 @@ if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" )
 	$wgOut->redirect( wfLocalUrl( $wgTitle->getPrefixedURL() ) );
 } else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
 	wfSpecialPage();
-} else if ( "" != $search ) {
-	if($go) {
-		wfGo( $search );
-	} else {
-		wfSearch( $search );
-	}
 } else {
 	if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
 		$wgTitle = Title::makeTitle( Namespace::getImage(), $wgTitle->getDBkey() );
-- 
2.20.1