From: Thiemo Kreuz <thiemo.kreuz@wikimedia.de>
Date: Wed, 24 Apr 2019 08:29:32 +0000 (+0200)
Subject: editpage: Make TextConflictHelper::toEditContent private
X-Git-Tag: 1.34.0-rc.0~1855^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=81fee5a5e96fbd0a6cecad75028ef643e0459d98;p=lhc%2Fweb%2Fwiklou.git

editpage: Make TextConflictHelper::toEditContent private

The method is not used anywhere:
https://codesearch.wmflabs.org/search/?q=toEditContent&i=1
There is another method with the same name in the EditPage class. But
this is unrelated. As far as I can see the method I'm touching in this
patch was copied from the EditPage class.

Change-Id: I51d167723bd70220adbf4ac36f15f3290b7eb653
---

diff --git a/includes/editpage/TextConflictHelper.php b/includes/editpage/TextConflictHelper.php
index 2471b526a0..b5b74fbbaf 100644
--- a/includes/editpage/TextConflictHelper.php
+++ b/includes/editpage/TextConflictHelper.php
@@ -245,7 +245,7 @@ class TextConflictHelper {
 	 * @param string $text
 	 * @return Content
 	 */
-	public function toEditContent( $text ) {
+	private function toEditContent( $text ) {
 		return ContentHandler::makeContent(
 			$text,
 			$this->title,