Disable Special:Sitesettings, as it is far far far from working.

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

diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 2e83974..e1de0bb 100644 (file)
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -42,6 +42,7 @@ class SearchEngine {
         * If an exact title match can be find, or a very slightly close match,
         * return the title. If no match, returns NULL.
         *
+        * @static
         * @param string $term
         * @return Title
         * @access private
@@ -74,12 +75,25 @@ class SearchEngine {
                        return $title;
                }
 
+               $title = Title::newFromText( $term );
+
                # Entering an IP address goes to the contributions page
-               if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $term ) ) {
-                       $title = Title::makeTitle( NS_SPECIAL, "Contributions/" . $term );
+               if ( ( $title->getNamespace() == NS_USER && User::isIP($title->getText() ) )
+                       || User::isIP( trim( $term ) ) ) {
+                       return Title::makeTitle( NS_SPECIAL, "Contributions/" . $title->getDbkey() );
+               }
+
+
+               # Entering a user goes to the user page whether it's there or not
+               if ( $title->getNamespace() == NS_USER ) {
                        return $title;
                }
                
+               # Quoted term? Try without the quotes...
+               if( preg_match( '/^"([^"]+)"$/', $term, $matches ) ) {
+                       return SearchEngine::getNearMatch( $matches[1] );
+               }
+               
                return NULL;
        }