Subject UtfNormal::cleanUp() to the same tests as UtfNormal::toNFC()

[lhc/web/wiklou.git] / index.php

diff --git a/index.php b/index.php
index ffc481d..1386b26 100644 (file)
--- a/index.php
+++ b/index.php
@@ -50,6 +50,9 @@ if ( "" == $title && "delete" != $action ) {
 }
 wfProfileOut( "main-misc-setup" );
 
+# Debug statement for user levels
+// print_r($wgUser);
+
 # If the user is not logged in, the Namespace:title of the article must be in
 # the Read array in order for the user to see it. (We have to check here to
 # catch special pages etc. We check again in Article::view())
@@ -62,16 +65,9 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 wfProfileIn( "main-action" );
 $search = $wgRequest->getText( 'search' );
 if( !is_null( $search ) && $search !== '' ) {
-       require_once( 'SearchEngine.php' );
+       require_once( 'includes/SpecialSearch.php' );
        $wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
-       $searchEngine = new SearchEngine( $search );
-       if( $wgRequest->getVal( 'fulltext' ) ||
-               !is_null( $wgRequest->getVal( 'offset' ) ) ||
-               !is_null ($wgRequest->getVal( 'searchx' ) ) ) {
-               $searchEngine->showResults();
-       } else {
-               $searchEngine->goResult();
-       }
+       wfSpecialSearch();
 } else if( !$wgTitle or $wgTitle->getDBkey() == "" ) {
        $wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
        $wgOut->errorpage( "badtitle", "badtitletext" );
@@ -153,10 +149,10 @@ if( !is_null( $search ) && $search !== '' ) {
                                wfCreativeCommonsRdf( $wgArticle );
                        }
                        break;
-               case "credits":
-                       require_once( "includes/Credits.php" );
+               case "credits":
+                       require_once( "includes/Credits.php" );
                        showCreditsPage( $wgArticle );
-                       break;
+                       break;
                case "edit":
                case "submit":
                        if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) {