Branch merge of preferences work branch. Includes fixes for several bugs. WARNING...

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

diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 959b736..86822d8 100644 (file)
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -240,13 +240,12 @@ class SearchEngine {
         * @param $user User
         * @return Array
         */
-       public static function userNamespaces( &$user ) {
-               $arr = array();
-               foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
-                       if( $user->getOption( 'searchNs' . $ns ) ) {
-                               $arr[] = $ns;
-                       }
-               }
+       public static function userNamespaces( $user ) {
+               $arr = Preferences::loadOldSearchNs( $user );
+               $searchableNamespaces = SearchEngine::searchableNamespaces();
+               
+               $arr = array_intersect( $arr, array_keys($searchableNamespaces) ); // Filter
+               
                return $arr;
        }