wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-13 18:37:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Invert logic on empty talk page""

Browse source
This commit is contained in:
jenkins-bot 2024-08-22 18:29:00 +00:00 committed by Gerrit Code Review
parent b4e9afe4a5 f96eba7e6e
commit f57ee98ee8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/CommentFormatter.php
View file

@ -410,8 +410,8 @@ class CommentFormatter {
->addTrackingCategory( $pout, 'discussiontools-comments-before-first-heading-category', $title ); ->addTrackingCategory( $pout, 'discussiontools-comments-before-first-heading-category', $title );
} }
if ( count( $threadItems ) > 0 ) { if ( count( $threadItems ) === 0 ) {
$pout->setExtensionData( 'DiscussionTools-isNotEmptyTalkPage', true ); $pout->setExtensionData( 'DiscussionTools-isEmptyTalkPage', true );
} }
$threadsJSON = array_map( static function ( ContentThreadItem $item ) { $threadsJSON = array_map( static function ( ContentThreadItem $item ) {
@ -926,7 +926,7 @@ class CommentFormatter {
* HookUtils::shouldDisplayEmptyState which assures we have a talk page. * HookUtils::shouldDisplayEmptyState which assures we have a talk page.
*/ */
public static function isEmptyTalkPage( ParserOutput $pout ): bool { public static function isEmptyTalkPage( ParserOutput $pout ): bool {
return $pout->getExtensionData( 'DiscussionTools-isNotEmptyTalkPage' ) !== true; return $pout->getExtensionData( 'DiscussionTools-isEmptyTalkPage' ) === true;
} }
/** /**

2
includes/Hooks/ParserHooks.php
View file

@ -72,7 +72,7 @@ class ParserHooks implements
if ( $isPreview ) { if ( $isPreview ) {
$html = CommentFormatter::removeInteractiveTools( $html ); $html = CommentFormatter::removeInteractiveTools( $html );
// Suppress the empty state // Suppress the empty state
$pout->setExtensionData( 'DiscussionTools-isNotEmptyTalkPage', true ); $pout->setExtensionData( 'DiscussionTools-isEmptyTalkPage', null );
} }
$pout->addModuleStyles( [ 'ext.discussionTools.init.styles' ] ); $pout->addModuleStyles( [ 'ext.discussionTools.init.styles' ] );

4
tests/phpunit/CommentFormatterTest.php
View file

@ -95,8 +95,8 @@ class CommentFormatterTest extends IntegrationTestCase {
"hasLedeContent\n" : '' ) . "hasLedeContent\n" : '' ) .
( $pout->getExtensionData( 'DiscussionTools-hasCommentsInLedeContent' ) ? ( $pout->getExtensionData( 'DiscussionTools-hasCommentsInLedeContent' ) ?
"hasCommentsInLedeContent\n" : '' ) . "hasCommentsInLedeContent\n" : '' ) .
( $pout->getExtensionData( 'DiscussionTools-isNotEmptyTalkPage' ) ? ( $pout->getExtensionData( 'DiscussionTools-isEmptyTalkPage' ) ?
'' : "isEmptyTalkPage\n" ) . "isEmptyTalkPage\n" : '' ) .
FormatJson::encode( $pout->getJsConfigVars(), "\t", FormatJson::ALL_OK ) . FormatJson::encode( $pout->getJsConfigVars(), "\t", FormatJson::ALL_OK ) .
"\n</pre>"; "\n</pre>";