Merge "Remove SourceIndexField FLAG_SOURCE_DATA"

diff --git a/includes/content/WikitextContentHandler.php b/includes/content/WikitextContentHandler.php
index b9fe004..978ac44 100644 (file)
--- a/includes/content/WikitextContentHandler.php
+++ b/includes/content/WikitextContentHandler.php
@@ -128,10 +128,6 @@ class WikitextContentHandler extends TextContentHandler {
                $fields['file_text'] =
                        $engine->makeSearchFieldMapping( 'file_text', SearchIndexField::INDEX_TYPE_TEXT );
 
-               $fields['defaultsort'] = $engine->makeSearchFieldMapping( 'defaultsort',
-                       SearchIndexField::INDEX_TYPE_TEXT );
-               $fields['defaultsort']->setFlag( SearchIndexField::FLAG_SOURCE_DATA );
-
                return $fields;
        }
 

diff --git a/includes/search/SearchIndexField.php b/includes/search/SearchIndexField.php
index cfed1e9..6806ee5 100644 (file)
--- a/includes/search/SearchIndexField.php
+++ b/includes/search/SearchIndexField.php
@@ -36,15 +36,6 @@ interface SearchIndexField {
         */
        const FLAG_NO_INDEX = 8;
 
-       /**
-        * Similar to FLAG_NO_INDEX but we inform the SearchEngine
-        * that this field should not be part of the search schema
-        * by default.
-        * SearchEngine implementations could then override its settings
-        * or simply use this data for other purposes.
-        */
-       const FLAG_SOURCE_DATA = 16;
-
        /**
         * Get mapping for specific search engine
         * @param SearchEngine $engine