From a35adefb266d6ac23b678055653d5d0cc2e18e84 Mon Sep 17 00:00:00 2001
From: WMDE-Fisch <christoph.fischer@wikimedia.de>
Date: Thu, 27 Oct 2016 15:49:49 +0200
Subject: [PATCH] Extract addition of conflict header explanation

This is done so it can be altered when using an alternative EditPage.

Bug: T143823
Change-Id: I31f5f2b7d35806a11925fb00e3272cac47c783ec
---
 includes/EditPage.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 78ef2e32cb..85c14fc496 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2869,7 +2869,7 @@ class EditPage {
 		global $wgAllowUserCss, $wgAllowUserJs;
 
 		if ( $this->isConflict ) {
-			$wgOut->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1\n</div>", 'explainconflict' );
+			$this->addExplainConflictHeader( $wgOut );
 			$this->editRevId = $this->page->getLatest();
 		} else {
 			if ( $this->section != '' && $this->section != 'new' ) {
@@ -4434,4 +4434,12 @@ HTML
 					'wrap' => "<div class=\"mw-titleprotectedwarning\">\n$1</div>" ] );
 		}
 	}
+
+	/**
+	 * @param OutputPage &$out
+	 * @since 1.29
+	 */
+	protected function addExplainConflictHeader( OutputPage &$out ) {
+		$out->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1\n</div>", 'explainconflict' );
+	}
 }
-- 
2.20.1