X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fsearch%2FSearchResult.php;h=aeaba8df324c3af6372ca0b9391a0f26f856d19f;hb=7a7f79394e70402c567dad068a7701e021b395d3;hp=d51bff7cdd65924654738721ee8d9188944e3796;hpb=27615c9ca1dbbc1b087eccd8b8b6ba7ffe52e5c3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/search/SearchResult.php b/includes/search/SearchResult.php
index d51bff7cdd..aeaba8df32 100644
--- a/includes/search/SearchResult.php
+++ b/includes/search/SearchResult.php
@@ -61,35 +61,6 @@ class SearchResult {
 		return $result;
 	}
 
-	/**
-	 * Return a new SearchResult and initializes it with a row.
-	 *
-	 * @param object $row
-	 * @return SearchResult
-	 */
-	public static function newFromRow( $row ) {
-		$result = new self();
-		$result->initFromRow( $row );
-		return $result;
-	}
-
-	public function __construct( $row = null ) {
-		if ( !is_null( $row ) ) {
-			// Backwards compatibility with pre-1.17 callers
-			$this->initFromRow( $row );
-		}
-	}
-
-	/**
-	 * Initialize from a database row. Makes a Title and passes that to
-	 * initFromTitle.
-	 *
-	 * @param object $row
-	 */
-	protected function initFromRow( $row ) {
-		$this->initFromTitle( Title::makeTitle( $row->page_namespace, $row->page_title ) );
-	}
-
 	/**
 	 * Initialize from a Title and if possible initializes a corresponding
 	 * Revision and File.
@@ -166,11 +137,16 @@ class SearchResult {
 
 		// TODO: make highliter take a content object. Make ContentHandler a factory for SearchHighliter.
 		list( $contextlines, $contextchars ) = SearchEngine::userHighlightPrefs();
+
 		$h = new SearchHighlighter();
-		if ( $wgAdvancedSearchHighlighting ) {
-			return $h->highlightText( $this->mText, $terms, $contextlines, $contextchars );
+		if ( count( $terms ) > 0 ) {
+			if ( $wgAdvancedSearchHighlighting ) {
+				return $h->highlightText( $this->mText, $terms, $contextlines, $contextchars );
+			} else {
+				return $h->highlightSimple( $this->mText, $terms, $contextlines, $contextchars );
+			}
 		} else {
-			return $h->highlightSimple( $this->mText, $terms, $contextlines, $contextchars );
+			return $h->highlightNone( $this->mText, $contextlines, $contextchars );
 		}
 	}
 
@@ -237,13 +213,6 @@ class SearchResult {
 		return strlen( $this->mText );
 	}
 
-	/**
-	 * @return bool If hit has related articles
-	 */
-	function hasRelated() {
-		return false;
-	}
-
 	/**
 	 * @return string Interwiki prefix of the title (return iw even if title is broken)
 	 */