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

Merge "Fix displaying reply links after posting a reply with dtenable=1"

Browse source
This commit is contained in:
jenkins-bot 2020-11-22 23:02:21 +00:00 committed by Gerrit Code Review
parent 4eed14b4e7 c17a076382
commit 7467e89da4
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/Hooks.php
View file

@ -79,6 +79,10 @@ class Hooks {
if ( $output->getRequest()->getVal( 'dtenable' ) ) {
return true;
}
// Extra hack for parses from API, where this parameter isn't passed to derivative requests
if ( RequestContext::getMain()->getRequest()->getVal( 'dtenable' ) ) {
return true;
}
$user = $output->getUser();
$services = MediaWikiServices::getInstance();

3
modules/CommentController.js
View file

@ -252,6 +252,9 @@ CommentController.prototype.save = function ( comment, pageName ) {
assert: mw.user.isAnon() ? 'anon' : 'user',
assertuser: mw.user.getName() || undefined,
uselang: mw.config.get( 'wgUserLanguage' ),
// HACK: Always display reply links afterwards, ignoring preferences etc., in case this was
// a page view with reply links forced with ?dtenable=1 or otherwise
dtenable: '1',
dttags: [
'discussiontools',
'discussiontools-reply',

3
modules/controller.js
View file

@ -311,6 +311,9 @@ function update( data, comment, pageName, replyWidget ) {
// adding our reply links in the HTML (T266195)
useskin: mw.config.get( 'skin' ),
uselang: mw.config.get( 'wgUserLanguage' ),
// HACK: Always display reply links afterwards, ignoring preferences etc., in case this was
// a page view with reply links forced with ?dtenable=1 or otherwise
dtenable: '1',
prop: [ 'text', 'modules', 'jsconfigvars' ],
page: mw.config.get( 'wgRelevantPageName' )
} );