Merge "Type hint against LinkTarget in WatchedItemStore"

[lhc/web/wiklou.git] / includes / skins / BaseTemplate.php

diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index 02247bd..cd79259 100644 (file)
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -43,18 +43,6 @@ abstract class BaseTemplate extends QuickTemplate {
                echo $this->getMsg( $str )->escaped();
        }
 
-       /**
-        * @param string $str
-        * @warning You should never use this method. I18n messages should be escaped
-        * @deprecated 1.32 Use ->msg() or ->getMsg() instead.
-        * @suppress SecurityCheck-XSS
-        * @return-taint exec_html
-        */
-       function msgHtml( $str ) {
-               wfDeprecated( __METHOD__, '1.32' );
-               echo $this->getMsg( $str )->text();
-       }
-
        /**
         * @deprecated since 1.33 Use ->msg() or ->getMsg() instead.
         */
@@ -97,7 +85,7 @@ abstract class BaseTemplate extends QuickTemplate {
                                $toolbox['feeds']['links'][$key]['class'] = 'feedlink';
                        }
                }
-               foreach ( [ 'contributions', 'log', 'blockip', 'emailuser',
+               foreach ( [ 'contributions', 'log', 'blockip', 'emailuser', 'mute',
                        'userrights', 'upload', 'specialpages' ] as $special
                ) {
                        if ( isset( $this->data['nav_urls'][$special] ) && $this->data['nav_urls'][$special] ) {
@@ -264,28 +252,26 @@ abstract class BaseTemplate extends QuickTemplate {
                                        $boxes[$boxName]['content'] = $content;
                                }
                        }
-               } else {
-                       if ( $hookContents ) {
-                               $boxes['TOOLBOXEND'] = [
-                                       'id' => 'p-toolboxend',
-                                       'header' => $boxes['TOOLBOX']['header'],
-                                       'generated' => false,
-                                       'content' => "<ul>{$hookContents}</ul>",
-                               ];
-                               // HACK: Make sure that TOOLBOXEND is sorted next to TOOLBOX
-                               $boxes2 = [];
-                               foreach ( $boxes as $key => $box ) {
-                                       if ( $key === 'TOOLBOXEND' ) {
-                                               continue;
-                                       }
-                                       $boxes2[$key] = $box;
-                                       if ( $key === 'TOOLBOX' ) {
-                                               $boxes2['TOOLBOXEND'] = $boxes['TOOLBOXEND'];
-                                       }
+               } elseif ( $hookContents ) {
+                       $boxes['TOOLBOXEND'] = [
+                               'id' => 'p-toolboxend',
+                               'header' => $boxes['TOOLBOX']['header'],
+                               'generated' => false,
+                               'content' => "<ul>{$hookContents}</ul>",
+                       ];
+                       // HACK: Make sure that TOOLBOXEND is sorted next to TOOLBOX
+                       $boxes2 = [];
+                       foreach ( $boxes as $key => $box ) {
+                               if ( $key === 'TOOLBOXEND' ) {
+                                       continue;
+                               }
+                               $boxes2[$key] = $box;
+                               if ( $key === 'TOOLBOX' ) {
+                                       $boxes2['TOOLBOXEND'] = $boxes['TOOLBOXEND'];
                                }
-                               $boxes = $boxes2;
-                               // END hack
                        }
+                       $boxes = $boxes2;
+                       // END hack
                }
 
                return $boxes;