X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fskins%2FBaseTemplate.php;h=6d108e8ec408e98c23d637411d4b879fd557372b;hb=e83ca504052654a2b9decdf6208fec335aa43e7a;hp=a71daa0980ce2cb48be7e18e687911e8d9531b54;hpb=00063e1eb126d6a0917331d46303d7ea180c74bc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index a71daa0980..6d108e8ec4 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -44,18 +44,10 @@ abstract class BaseTemplate extends QuickTemplate {
 	}
 
 	/**
-	 * @param string $str
-	 * @warning You should never use this method. I18n messages should be escaped
-	 * @deprecated 1.32 Use ->msg() or ->msgWiki() instead.
-	 * @suppress SecurityCheck-XSS
-	 * @return-taint exec_html
+	 * @deprecated since 1.33 Use ->msg() or ->getMsg() instead.
 	 */
-	function msgHtml( $str ) {
-		wfDeprecated( __METHOD__, '1.32' );
-		echo $this->getMsg( $str )->text();
-	}
-
 	function msgWiki( $str ) {
+		// TODO: Add wfDeprecated( __METHOD__, '1.33' ) after 1.33 got released
 		echo $this->getMsg( $str )->parseAsBlock();
 	}
 
@@ -260,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;