Merge "Rewrite pref cleanup script"

[lhc/web/wiklou.git] / includes / widget / search / FullSearchResultWidget.php

diff --git a/includes/widget/search/FullSearchResultWidget.php b/includes/widget/search/FullSearchResultWidget.php
index 0d0fa12..af1e027 100644 (file)
--- a/includes/widget/search/FullSearchResultWidget.php
+++ b/includes/widget/search/FullSearchResultWidget.php
@@ -79,7 +79,7 @@ class FullSearchResultWidget implements SearchResultWidget {
                        if ( !Hooks::run( 'ShowSearchHit', [
                                $this->specialPage, $result, $terms,
                                &$link, &$redirect, &$section, &$extract,
-                               &$score, &$size, &$date, &$related, &$html
+                               &$score, &$desc, &$date, &$related, &$html
                        ] ) ) {
                                return $html;
                        }
@@ -133,13 +133,14 @@ class FullSearchResultWidget implements SearchResultWidget {
                $title = clone $result->getTitle();
                $query = [];
 
+               $attributes = [ 'data-serp-pos' => $position ];
                Hooks::run( 'ShowSearchHitTitle',
-                       [ &$title, &$snippet, $result, $terms, $this->specialPage, &$query ] );
+                       [ &$title, &$snippet, $result, $terms, $this->specialPage, &$query, &$attributes ] );
 
                $link = $this->linkRenderer->makeLink(
                        $title,
                        $snippet,
-                       [ 'data-serp-pos' => $position ],
+                       $attributes,
                        $query
                );
 
@@ -162,7 +163,7 @@ class FullSearchResultWidget implements SearchResultWidget {
                        : $this->linkRenderer->makeLink( $title, $text ? new HtmlArmor( $text ) : null );
 
                return "<span class='searchalttitle'>" .
-                               $this->specialPage->msg( $msgKey )->rawParams( $inner )->text()
+                               $this->specialPage->msg( $msgKey )->rawParams( $inner )->parse()
                        . "</span>";
        }