jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342245 )
Change subject: Remove conflict warning for users of visual editor
......................................................................
Remove conflict warning for users of visual editor
Bug: T159821
Change-Id: I98912d7097150385a7e946311ffb035d057f88ab
---
M includes/TwoColConflictPage.php
1 file changed, 13 insertions(+), 10 deletions(-)
Approvals:
Addshore: Looks good to me, but someone else must approve
WMDE-Fisch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 06bc6de..e26dd57 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -22,18 +22,21 @@
* @param OutputPage $out
*/
protected function addExplainConflictHeader( OutputPage $out ) {
- $labelAsPublish = $this->context->getConfig()->get(
- 'EditSubmitButtonLabelPublish'
- );
+ // don't show conflict message when coming from VisualEditor
+ if ( $this->getContext()->getRequest()->getVal( 'veswitched' )
!== "1" ) {
+ $labelAsPublish = $this->context->getConfig()->get(
+ 'EditSubmitButtonLabelPublish'
+ );
- $buttonLabel = $this->context->msg(
- $labelAsPublish ? 'publishchanges' : 'savechanges'
- )->text();
+ $buttonLabel = $this->context->msg(
+ $labelAsPublish ? 'publishchanges' :
'savechanges'
+ )->text();
- $out->wrapWikiMsg(
- "<div class='mw-twocolconflict-explainconflict
warningbox'>\n$1\n</div>",
- [ 'twoColConflict-explainconflict', $buttonLabel ]
- );
+ $out->wrapWikiMsg(
+ "<div class='mw-twocolconflict-explainconflict
warningbox'>\n$1\n</div>",
+ [ 'twoColConflict-explainconflict',
$buttonLabel ]
+ );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/342245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98912d7097150385a7e946311ffb035d057f88ab
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
