Merge "backport release notes from Ia6efdf931b0b6be7556fc16c040aa7493845cdfc"

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

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 3dc90c6..380e20e 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -78,7 +78,7 @@ class SpecialSearch extends SpecialPage {
        /**
         * Entry point
         *
-        * @param $par String or null
+        * @param string $par or null
         */
        public function execute( $par ) {
                $this->setHeaders();
@@ -356,7 +356,6 @@ class SpecialSearch extends SpecialPage {
                $out->addHTML( $this->formHeader( $term, $num, $totalRes ) );
                $out->addHtml( $this->getProfileForm( $this->profile, $term ) );
 
-
                $out->addHtml( Xml::closeElement( 'form' ) );
                $out->addHtml( "<div class='searchresults'>" );
 
@@ -537,7 +536,7 @@ class SpecialSearch extends SpecialPage {
         * Format a single hit result
         *
         * @param $result SearchResult
-        * @param $terms Array: terms to highlight
+        * @param array $terms terms to highlight
         *
         * @return string
         */
@@ -759,7 +758,7 @@ class SpecialSearch extends SpecialPage {
         * @param $lastInterwiki String
         * @param $terms Array
         * @param $query String
-        * @param $customCaptions Array: iw prefix -> caption
+        * @param array $customCaptions iw prefix -> caption
         *
         * @return string
         */
@@ -852,7 +851,7 @@ class SpecialSearch extends SpecialPage {
        /**
         * Generates the power search box at [[Special:Search]]
         *
-        * @param $term String: search term
+        * @param string $term search term
         * @param $opts array
         * @return String: HTML form
         */
@@ -913,8 +912,7 @@ class SpecialSearch extends SpecialPage {
                        $hidden .= Html::hidden( $key, $value );
                }
                // Return final output
-               return
-                       Xml::openElement(
+               return Xml::openElement(
                                'fieldset',
                                array( 'id' => 'mw-searchoptions', 'style' => 'margin:0em;' )
                        ) .
@@ -1074,10 +1072,10 @@ class SpecialSearch extends SpecialPage {
         * Make a search link with some target namespaces
         *
         * @param $term String
-        * @param $namespaces Array ignored
-        * @param $label String: link's text
-        * @param $tooltip String: link's tooltip
-        * @param $params Array: query string parameters
+        * @param array $namespaces ignored
+        * @param string $label link's text
+        * @param string $tooltip link's tooltip
+        * @param array $params query string parameters
         * @return String: HTML fragment
         */
        protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params = array() ) {
@@ -1099,7 +1097,8 @@ class SpecialSearch extends SpecialPage {
                        'a',
                        array(
                                'href' => $this->getTitle()->getLocalURL( $stParams ),
-                               'title' => $tooltip),
+                               'title' => $tooltip
+                       ),
                        $label
                );
        }
@@ -1107,7 +1106,7 @@ class SpecialSearch extends SpecialPage {
        /**
         * Check if query starts with image: prefix
         *
-        * @param $term String: the string to check
+        * @param string $term the string to check
         * @return Boolean
         */
        protected function startsWithImage( $term ) {
@@ -1123,7 +1122,7 @@ class SpecialSearch extends SpecialPage {
        /**
         * Check if query starts with all: prefix
         *
-        * @param $term String: the string to check
+        * @param string $term the string to check
         * @return Boolean
         */
        protected function startsWithAll( $term ) {
@@ -1162,4 +1161,7 @@ class SpecialSearch extends SpecialPage {
                $this->extraParams[$key] = $value;
        }
 
+       protected function getGroupName() {
+               return 'redirects';
+       }
 }