X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fsearch%2FSearchEngine.php;h=c17f8c2c7a57bf6c41bc6ffe1565994ef31f2c58;hp=2ccb6d3164d7cd02b0056bc76c5aeb74f74ebf72;hb=12166f46b4d63d3fd3cab68cf4c7090a1646dd09;hpb=e40a90f0bcbab65a8e0c4bf9d9a12285bd510215

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 2ccb6d3164..c17f8c2c7a 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -804,11 +804,13 @@ class SearchResult {
 	 */
 	protected function initText() {
 		if ( !isset( $this->mText ) ) {
-			if ( $this->mRevision != null )
-				$this->mText = $this->mRevision->getText();
-			else // TODO: can we fetch raw wikitext for commons images?
+			if ( $this->mRevision != null ) {
+				//TODO: don't use the text, but the content object!
+				$content = $this->mRevision->getContent();
+				$this->mText = $content->getTextForSearchIndex();
+			} else { // TODO: can we fetch raw wikitext for commons images?
 				$this->mText = '';
-
+			}
 		}
 	}
 
@@ -819,6 +821,8 @@ class SearchResult {
 	function getTextSnippet( $terms ) {
 		global $wgUser, $wgAdvancedSearchHighlighting;
 		$this->initText();
+
+		// TODO: make highliter take a content object. Make ContentHandler a factory for SearchHighliter.
 		list( $contextlines, $contextchars ) = SearchEngine::userHighlightPrefs( $wgUser );
 		$h = new SearchHighlighter();
 		if ( $wgAdvancedSearchHighlighting )