Fix bug 145: finish 'exclude redirect' implementation

diff --git a/includes/SearchMySQL.php b/includes/SearchMySQL.php
index 310a7b9..407a1c7 100644 (file)
--- a/includes/SearchMySQL.php
+++ b/includes/SearchMySQL.php
@@ -61,9 +61,9 @@ class SearchMySQL extends SearchEngine {
         */
        function queryRedirect() {
                if( $this->showRedirects ) {
-                       return 'AND cur_is_redirect=0';
-               } else {
                        return '';
+               } else {
+                       return 'AND page_is_redirect=0';
                }
        }
        

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index fda21c3..4981c74 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -69,8 +69,8 @@ class SpecialSearch {
                } else {
                        $this->namespaces = $this->userNamespaces( $user );
                }
-               
-               $this->searchRedirects = false;
+
+               $this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
        }
        
        /**
@@ -164,6 +164,7 @@ class SpecialSearch {
                $search = SearchEngine::create();
                $search->setLimitOffset( $this->limit, $this->offset );
                $search->setNamespaces( $this->namespaces );
+               $search->showRedirects = $this->searchRedirects;
                $titleMatches = $search->searchTitle( $term );
                $textMatches = $search->searchText( $term );