X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=24fa89ae9bfab8f33c19effd21a56dccd0ac2b88;hb=eb4f08984c62f9c8411aad7b46456207b87bf328;hp=3c47a3fd0dc2ad77dad4a7741c2d3fa7c266203a;hpb=f7928ac36df614d8868d35d4d4486671761b5fd2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 3c47a3fd0d..24fa89ae9b 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2870,7 +2870,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' ) {
@@ -4435,4 +4435,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' );
+	}
 }