* Fixed magic quotes in $_REQUEST, in Setup.php

[lhc/web/wiklou.git] / includes / SearchEngine.php

diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 7e273cc..ee38899 100644 (file)
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -1,4 +1,4 @@
-<?
+<?php
 # See search.doc
 
 class SearchEngine {
@@ -130,8 +130,10 @@ class SearchEngine {
                  wfMsg("powersearch") . "\">\n";
                $ret = str_replace( "$9", $tempText, $ret );
 
+               $titleObj = NULL; # this does tricky stuff
+               
                $ret = "<br><br>\n<form id=\"powersearch\" method=\"get\" " .
-                 "action=\"" . wfLocalUrl( "" ) . "\">\n{$ret}\n</form>\n";
+                 "action=\"" . $titleObj->getUrl() . "\">\n{$ret}\n</form>\n";
 
                if ( isset ( $searchx ) ) {
                        if ( ! $listredirs ) { 
@@ -433,7 +435,7 @@ class SearchEngine {
                }
 
                if ( 0 != $t->getArticleID() ) {
-                       $wgOut->redirect( wfLocalUrl( $t->getPrefixedURL() ) );
+                       $wgOut->redirect( $t->getURL() );
                        return;
                }
 
@@ -441,7 +443,7 @@ class SearchEngine {
                #
                $t = Title::newFromText( strtolower( $search ) );
                if ( 0 != $t->getArticleID() ) {
-                       $wgOut->redirect( wfLocalUrl( $t->getPrefixedURL() ) );
+                       $wgOut->redirect( $t->getURL() );
                        return;
                }
 
@@ -449,7 +451,7 @@ class SearchEngine {
                #
                $t = Title::newFromText( ucwords( strtolower( $search ) ) );
                if ( 0 != $t->getArticleID() ) {
-                       $wgOut->redirect( wfLocalUrl( $t->getPrefixedURL() ) );
+                       $wgOut->redirect( $t->getURL() );
                        return;
                }
 
@@ -457,12 +459,13 @@ class SearchEngine {
                #
                $t = Title::newFromText( strtoupper( $search ) );
                if ( 0 != $t->getArticleID() ) {
-                       $wgOut->redirect( wfLocalUrl( $t->getPrefixedURL() ) );
+                       $wgOut->redirect( $t->getURL() );
                        return;
                }
-               $wgOut->addHTML( wfMsg("nogomatch", 
-                       htmlspecialchars( wfLocalUrl( ucfirst($this->mUsertext), "action=edit") ) )
-                       . "\n<p>" );
+
+               # No match, generate an edit URL
+               $t = Title::newFromText( $this->mUsertext );
+               $wgOut->addHTML( wfMsg("nogomatch", $t->getURL( "action=edit", true ) ) . "\n<p>" );
 
                # Try a fuzzy title search
                $anyhit = false;
@@ -471,11 +474,11 @@ class SearchEngine {
                        foreach( array(NS_MAIN, NS_WP, NS_USER, NS_IMAGE, NS_MEDIAWIKI) as $namespace){
                                $anyhit |= SearchEngine::doFuzzyTitleSearch( $search, $namespace );
                        }
-               } 
+               }
+               
                if( ! $anyhit ){
-                       $wgOut->addHTML( wfMsg("notitlematches") );
+                       return $this->showResults();
                }
-               $wgOut->addHTML( wfMsg( "googlesearch", htmlspecialchars( $search ), $GLOBALS['wgInputEncoding'] ) );
        }
 
        /* static */ function doFuzzyTitleSearch( $search, $namespace ){