Merge "mw.htmlform: Fields hidden with 'hide-if' should be disabled"

[lhc/web/wiklou.git] / includes / specials / SpecialSearch.php

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index f4e0b5b..727179a 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -502,7 +502,7 @@ class SpecialSearch extends SpecialPage {
                $linkRenderer = $this->getLinkRenderer();
 
                $snippet = $textMatches->getSuggestionSnippet() ?: null;
-               if ( $snippet ) {
+               if ( $snippet !== null ) {
                        $snippet = new HtmlArmor( $snippet );
                }
 
@@ -545,7 +545,7 @@ class SpecialSearch extends SpecialPage {
                $linkRenderer = $this->getLinkRenderer();
 
                $snippet = $textMatches->getQueryAfterRewriteSnippet() ?: null;
-               if ( $snippet ) {
+               if ( $snippet !== null ) {
                        $snippet = new HtmlArmor( $snippet );
                }
 
@@ -782,9 +782,13 @@ class SpecialSearch extends SpecialPage {
 
                $linkRenderer = $this->getLinkRenderer();
 
+               if ( $titleSnippet !== null ) {
+                       $titleSnippet = new HtmlArmor( $titleSnippet );
+               }
+
                $link = $linkRenderer->makeKnownLink(
                        $link_t,
-                       new HtmlArmor( $titleSnippet ),
+                       $titleSnippet,
                        [ 'data-serp-pos' => $position ], // HTML attributes
                        $query
                );
@@ -816,9 +820,13 @@ class SpecialSearch extends SpecialPage {
                                $redirectText = null;
                        }
 
+                       if ( $redirectText !== null ) {
+                               $redirectText = new HtmlArmor( $redirectText );
+                       }
+
                        $redirect = "<span class='searchalttitle'>" .
                                $this->msg( 'search-redirect' )->rawParams(
-                                       $linkRenderer->makeKnownLink( $redirectTitle, new HtmlArmor( $redirectText ) ) )->text() .
+                                       $linkRenderer->makeKnownLink( $redirectTitle, $redirectText ) )->text() .
                                "</span>";
                }
 
@@ -828,9 +836,13 @@ class SpecialSearch extends SpecialPage {
                                $sectionText = null;
                        }
 
+                       if ( $sectionText !== null ) {
+                               $sectionText = new HtmlArmor( $sectionText );
+                       }
+
                        $section = "<span class='searchalttitle'>" .
                                $this->msg( 'search-section' )->rawParams(
-                                       $linkRenderer->makeKnownLink( $sectionTitle, new HtmlArmor( $sectionText ) ) )->text() .
+                                       $linkRenderer->makeKnownLink( $sectionTitle, $sectionText ) )->text() .
                                "</span>";
                }
 
@@ -997,9 +1009,13 @@ class SpecialSearch extends SpecialPage {
                        $titleSnippet = null;
                }
 
+               if ( $titleSnippet !== null ) {
+                       $titleSnippet = new HtmlArmor( $titleSnippet );
+               }
+
                $link = $linkRenderer->makeKnownLink(
                        $title,
-                       new HtmlArmor( $titleSnippet )
+                       $titleSnippet
                );
 
                // format redirect if any
@@ -1011,9 +1027,13 @@ class SpecialSearch extends SpecialPage {
                                $redirectText = null;
                        }
 
+                       if ( $redirectText !== null ) {
+                               $redirectText = new HtmlArmor( $redirectText );
+                       }
+
                        $redirect = "<span class='searchalttitle'>" .
                                $this->msg( 'search-redirect' )->rawParams(
-                                       $linkRenderer->makeKnownLink( $redirectTitle, new HtmlArmor( $redirectText ) ) )->text() .
+                                       $linkRenderer->makeKnownLink( $redirectTitle, $redirectText ) )->text() .
                                "</span>";
                }