Merge "Fix highlighting for phrase queries"

diff --combined includes/search/SearchEngine.php
index ac95e7c,9673aa3..7d05265
--- 1/includes/search/SearchEngine.php
--- 2/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@@ -206,7 -206,7 +206,7 @@@ abstract class SearchEngine 
        }
  
        /**
-        * Get chars legal for search.
+        * Get chars legal for search (at query time).
         * NOTE: usage as static is deprecated and preserved only as BC measure
         * @return string
         */
@@@ -214,6 -214,16 +214,16 @@@
                return "A-Za-z_'.0-9\\x80-\\xFF\\-";
        }
  
+       /**
+        * Get chars legal for search (at index time).
+        *
+        * @since 1.30
+        * @return string
+        */
+       public function legalSearchCharsForUpdate() {
+               return static::legalSearchChars();
+       }
+ 
        /**
         * Set the maximum number of results to return
         * and how many to skip before returning the first.
@@@ -236,7 -246,7 +246,7 @@@
                if ( $namespaces ) {
                        // Filter namespaces to only keep valid ones
                        $validNs = $this->searchableNamespaces();
 -                      $namespaces = array_filter( $namespaces, function( $ns ) use( $validNs ) {
 +                      $namespaces = array_filter( $namespaces, function ( $ns ) use( $validNs ) {
                                return $ns < 0 || isset( $validNs[$ns] );
                        } );
                } else {
@@@ -464,7 -474,7 +474,7 @@@
                        }
                }
  
 -              $ns = array_map( function( $space ) {
 +              $ns = array_map( function ( $space ) {
                        return $space == NS_MEDIA ? NS_FILE : $space;
                }, $ns );
  
@@@ -550,7 -560,7 +560,7 @@@
         * @return Title[]
         */
        public function extractTitles( SearchSuggestionSet $completionResults ) {
 -              return $completionResults->map( function( SearchSuggestion $sugg ) {
 +              return $completionResults->map( function ( SearchSuggestion $sugg ) {
                        return $sugg->getSuggestedTitle();
                } );
        }
@@@ -564,14 -574,14 +574,14 @@@
        protected function processCompletionResults( $search, SearchSuggestionSet $suggestions ) {
                $search = trim( $search );
                // preload the titles with LinkBatch
 -              $titles = $suggestions->map( function( SearchSuggestion $sugg ) {
 +              $titles = $suggestions->map( function ( SearchSuggestion $sugg ) {
                        return $sugg->getSuggestedTitle();
                } );
                $lb = new LinkBatch( $titles );
                $lb->setCaller( __METHOD__ );
                $lb->execute();
  
 -              $results = $suggestions->map( function( SearchSuggestion $sugg ) {
 +              $results = $suggestions->map( function ( SearchSuggestion $sugg ) {
                        return $sugg->getSuggestedTitle()->getPrefixedText();
                } );