From 5565c7e4f07e7490a886ee546d99bd13d1a6cf01 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Thu, 2 Apr 2020 19:16:54 +0100
Subject: [PATCH] Enable on all ExtraSignaturesNamespaces

For most Wikimedia wikis, this is Project (Wikipedia) and Help.

Bug: T249036
Change-Id: I535240dc5232b78f11d5003d1141ad8114f01be2
---
 includes/DiscussionToolsHooks.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/DiscussionToolsHooks.php b/includes/DiscussionToolsHooks.php
index 57cf71f6d..f3ab29a93 100644
--- a/includes/DiscussionToolsHooks.php
+++ b/includes/DiscussionToolsHooks.php
@@ -45,8 +45,9 @@ class DiscussionToolsHooks {
 	 * @param Skin $skin The skin that's going to build the UI.
 	 */
 	public static function onBeforePageDisplay( OutputPage $output, Skin $skin ) {
-		$dtConfig = MediaWikiServices::getInstance()->getConfigFactory()
-			->makeConfig( 'discussiontools' );
+		$coreConfig = RequestContext::getMain()->getConfig();
+		$services = MediaWikiServices::getInstance();
+		$dtConfig = $services->getConfigFactory()->makeConfig( 'discussiontools' );
 		$title = $output->getTitle();
 		$actionName = Action::getActionName( $output->getContext() );
 		$req = $output->getRequest();
@@ -64,9 +65,10 @@ class DiscussionToolsHooks {
 			(
 				// Query parameter to load on any wikitext page for testing
 				$req->getVal( 'dtenable' ) ||
-				// If configured, load on all talk pages
+				// If configured, load on all pages that probably have discussions
 				( $enabled && (
-					$title->isTalkPage() ||
+					// `wantSignatures` includes talk pages
+					$services->getNamespaceInfo()->wantSignatures( $title->getNamespace() ) ||
 					// Treat pages with __NEWSECTIONLINK__ as talk pages (T245890)
 					$output->showNewSectionLink()
 					// TODO: Consider not loading if forceHideNewSectionLink is true.