Merge "Don't add the "minerva--history-page-action-enabled" class to <body>...

Merge "Don't add the "minerva--history-page-action-enabled" class to <body> for non-Minerva skins like MonoBook etc."

Merge "Don't add the "minerva--history-page-action-enabled" class to <body>...
Merge "Don't add the "minerva--history-page-action-enabled" class to <body> for non-Minerva skins like MonoBook etc."
a477102e · jenkins-bot · Gerrit Code Review · eab9cb47 · 2060ead3 · a477102e
Commit a477102e authored 4 years ago by jenkins-bot Committed by Gerrit Code Review 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 10 deletions
+9 -10
--- a/includes/MinervaHooks.php
+++ b/includes/MinervaHooks.php
@@ -349,23 +349,22 @@ class MinervaHooks {
 	public static function onOutputPageBodyAttributes( OutputPage $out, Skin $skin, &$bodyAttrs ) {
 		$classes = $out->getProperty( 'bodyClassName' );
 		$skinOptions = MediaWikiServices::getInstance()->getService( 'Minerva.SkinOptions' );
+		$isMinerva = $skin instanceof SkinMinerva;

-		if ( $skinOptions->get( SkinOptions::HISTORY_IN_PAGE_ACTIONS ) ) {
+		if ( $isMinerva && $skinOptions->get( SkinOptions::HISTORY_IN_PAGE_ACTIONS ) ) {
 			// Class is used when page actions is modified to contain more elements
 			$classes .= ' minerva--history-page-action-enabled';
-
 		}

-		$isSimplifiedTalk = false;
-		if ( $skin instanceof SkinMinerva ) {
-			$isSimplifiedTalk = $skin->isSimplifiedTalkPageEnabled();
-		}
+		if ( $isMinerva ) {
+			// phan doesn't realize that $skin can only be an instance of SkinMinerva without this:
+			'@phan-var SkinMinerva $skin';
+			if ( $skin->isSimplifiedTalkPageEnabled() ) {
+				$classes .= ' skin-minerva--talk-simplified';
+			}

-		if ( $isSimplifiedTalk ) {
-			$classes .= ' skin-minerva--talk-simplified';
+			$bodyAttrs['class'] .= ' ' . $classes;
 		}
-
-		$bodyAttrs[ 'class' ] .= ' ' . $classes;
 	}

 	/**