jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379458 )
Change subject: Don't use EditPage::$mArticle directly
......................................................................
Don't use EditPage::$mArticle directly
It's being deprecated in I2a931826ea142f.
Change-Id: Ic236906313bb660782c59f82783c83dbe938df2d
---
M includes/TwoColConflictHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
WMDE-Fisch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index ed9c268..498580a 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -35,7 +35,7 @@
$key = array_search( 'TwoColConflictHooks::onAlternateEdit',
$wgHooks['AlternateEdit'] );
unset( $wgHooks[ 'AlternateEdit' ][ $key ] );
- $twoColConflictPage = new TwoColConflictPage(
$editPage->mArticle );
+ $twoColConflictPage = new TwoColConflictPage(
$editPage->getArticle() );
$twoColConflictPage->edit();
return false;
--
To view, visit https://gerrit.wikimedia.org/r/379458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic236906313bb660782c59f82783c83dbe938df2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
