Merge "Use MinervaNeue hook to disable talk overlay if DT mobile enabled"

extension.json

@@ -425,6 +425,7 @@
 		"BeforeCreateEchoEvent": "\\MediaWiki\\Extension\\DiscussionTools\\Hooks\\EchoHooks::onBeforeCreateEchoEvent",
 		"EchoGetBundleRules": "\\MediaWiki\\Extension\\DiscussionTools\\Hooks\\EchoHooks::onEchoGetBundleRules",
 		"EchoGetEventsForRevision": "\\MediaWiki\\Extension\\DiscussionTools\\Hooks\\EchoHooks::onEchoGetEventsForRevision",
+		"MinervaNeueTalkPageOverlay": "\\MediaWiki\\Extension\\DiscussionTools\\Hooks\\MobileHooks::onMinervaNeueTalkPageOverlay",
 		"LoadExtensionSchemaUpdates": "installer",
 		"ParserAfterParse": "parser",
 		"ParserAfterTidy": "parser",

includes/Hooks/MobileHooks.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * DiscussionTools mobile hooks
+ *
+ * @file
+ * @ingroup Extensions
+ * @license MIT
+ */
+
+namespace MediaWiki\Extension\DiscussionTools\Hooks;
+
+use MediaWiki\MediaWikiServices;
+
+class MobileHooks {
+	/**
+	 * Decide whether mobile frontend should be allowed to activate
+	 *
+	 * @param \Title $title
+	 * @param \OutputPage $output
+	 * @return bool|void This hook can return false to abort, causing the talk overlay to not be shown
+	 */
+	public static function onMinervaNeueTalkPageOverlay( $title, $output ) {
+		$dtConfig = MediaWikiServices::getInstance()->getConfigFactory()
+			->makeConfig( 'discussiontools' );
+		if ( !$dtConfig->get( 'DiscussionToolsEnableMobile' ) ) {
+			return true;
+		}
+		if ( HookUtils::isFeatureEnabledForOutput( $output ) ) {
+			return false;
+		}
+		return true;
+	}
+}