Merge "Special:ListUsers: Use HTMLForm and OOUI"

[lhc/web/wiklou.git] / includes / specialpage / SpecialPage.php

diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php
index b883d33..67c14d8 100644 (file)
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -456,7 +456,7 @@ class SpecialPage implements MessageLocalizer {
                $searchEngine->setLimitOffset( $limit, $offset );
                $searchEngine->setNamespaces( [] );
                $result = $searchEngine->defaultPrefixSearch( $search );
-               return array_map( function( Title $t ) {
+               return array_map( function ( Title $t ) {
                        return $t->getPrefixedText();
                }, $result );
        }
@@ -783,6 +783,10 @@ class SpecialPage implements MessageLocalizer {
         * @since 1.25
         */
        public function addHelpLink( $to, $overrideBaseUrl = false ) {
+               if ( $this->including() ) {
+                       return;
+               }
+
                global $wgContLang;
                $msg = $this->msg( $wgContLang->lc( $this->getName() ) . '-helppage' );