Bsitu has submitted this change and it was merged.
Change subject: (Bug 46419) New: By using "Discuss on talk page" the page gets
unwatched
......................................................................
(Bug 46419) New: By using "Discuss on talk page" the page gets unwatched
Change-Id: I0fe2e67bc454e29380337bc620eff8566334549d
---
M ArticleFeedbackv5.render.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Bsitu: Verified; Looks good to me, approved
Se4598: Looks good to me, but someone else must approve
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index f6adce6..fc1a5a8 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -931,7 +931,8 @@
'data-section-title' => $sectionTitleTruncated,
'data-section-content' => $sectionContent,
'data-section-edittime' => wfTimestampNow(),
-
'data-section-edittoken' => $wgUser->getEditToken()
+
'data-section-edittoken' => $wgUser->getEditToken(),
+
'data-section-watchlist' => (int) $wgUser->isWatched( $discussPage )
),
wfMessage(
"articlefeedbackv5-form-$action-$discussType" . ( $sectionExists ? '-exists' :
'' ) )->text()
)
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index 1147a70..6ad65c6 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -1744,6 +1744,7 @@
var content = $( e.target ).data(
'section-content' );
var editTime = $( e.target ).data(
'section-edittime' );
var editToken = $( e.target ).data(
'section-edittoken' );
+ var watchlist = $( e.target ).data(
'section-watchlist' );
var $form = $( '\
<form method="post">\
@@ -1753,6 +1754,7 @@
<input type="hidden"
name="wpStarttime" />\
<input type="hidden"
name="wpEditToken" />\
<input type="hidden"
name="wpPreview" />\
+ <input type="hidden"
name="wpWatchthis" />\
<input type="submit" />\
</form>' );
@@ -1763,6 +1765,7 @@
$( '[name=wpStarttime]', $form ).val(
editTime );
$( '[name=wpEditToken]', $form ).val(
editToken );
$( '[name=wpPreview]', $form ).val( 1 );
+ $( '[name=wpWatchthis]', $form ).val(
watchlist );
$( e.target ).append( $form );
$form
--
To view, visit https://gerrit.wikimedia.org/r/55067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fe2e67bc454e29380337bc620eff8566334549d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: Se4598 <se4...@gmx.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
