Revert "no h3 for portlet name null"

This reverts commit dc2c650.
fpt-corp · May 26, 2021 · 3476fb5 · 3476fb5
1 parent dbd8073
commit 3476fb5
Showing 1 changed file with 22 additions and 38 deletions.
diff --git a/skins/Timeless/includes/TimelessTemplate.php b/skins/Timeless/includes/TimelessTemplate.php
@@ -189,25 +189,21 @@ protected function getPortlet( $name, $content, $msg = null, $setOptions = [] )
 		], $setOptions );
 
 		// Handle the different $msg possibilities
-		if ( $name == '' ) {
-			$msgString = '';
-		else {
-			if ( $msg === null ) {
-				$msg = $name;
-				$msgParams = [];
-			} elseif ( is_array( $msg ) ) {
-				$msgString = array_shift( $msg );
-				$msgParams = $msg;
-				$msg = $msgString;
-			} else {
-				$msgParams = [];
-			}
-			$msgObj = $this->getMsg( $msg, $msgParams );
-			if ( $msgObj->exists() ) {
-				$msgString = $msgObj->parse();
-			} else {
-				$msgString = htmlspecialchars( $msg );
-			}
+		if ( $msg === null ) {
+			$msg = $name;
+			$msgParams = [];
+		} elseif ( is_array( $msg ) ) {
+			$msgString = array_shift( $msg );
+			$msgParams = $msg;
+			$msg = $msgString;
+		} else {
+			$msgParams = [];
+		}
+		$msgObj = $this->getMsg( $msg, $msgParams );
+		if ( $msgObj->exists() ) {
+			$msgString = $msgObj->parse();
+		} else {
+			$msgString = htmlspecialchars( $msg );
 		}
 
 		$labelId = Sanitizer::escapeIdForAttribute( "p-$name-label" ); 
@@ -256,22 +252,13 @@ protected function getPortlet( $name, $content, $msg = null, $setOptions = [] )
 			$bodyDivOptions['id'] = $options['body-id'];
 		}
 
-		if ($name == '') {
-			$html = Html::rawElement( 'div', $divOptions,
-				Html::rawElement( 'div', $bodyDivOptions,
-					$contentText .
-					$this->getAfterPortlet( $name )
-				)
-			);			
-		} else {
-			$html = Html::rawElement( 'div', $divOptions,
-				Html::rawElement( 'h3', $labelOptions, $msgString ) .
-				Html::rawElement( 'div', $bodyDivOptions,
-					$contentText .
-					$this->getAfterPortlet( $name )
-				)
-			);
-		}
+		$html = Html::rawElement( 'div', $divOptions,
+			Html::rawElement( 'h3', $labelOptions, $msgString ) .
+			Html::rawElement( 'div', $bodyDivOptions,
+				$contentText .
+				$this->getAfterPortlet( $name )
+			)
+		);
 
 		return $html;
 	}
@@ -342,9 +329,6 @@ protected function getMainNavigation() {
 			}
 			// Numeric strings gets an integer when set as key, cast back - T73639
 			$name = (string)$name;
-			if ( $name == 'navigation' ) {
-				$name = '';
-			}
 			if ( $name == 'TOOLBOX' ) {
 				$html .= $this->getUserLinks();
 				$html .= $this->getPortlet( 'actions', $this->pileOfTools['page-primary']);