From d659a8160418ddf57b6292260a6af7a6513cdbf3 Mon Sep 17 00:00:00 2001 From: aude Date: Fri, 26 Oct 2012 03:47:30 +0000 Subject: [PATCH] fix and provide more documentation in EditPage for mergeContentInto functions Change-Id: I2a5aed29a6e8ff05ddea5d46f854740b9f3b03b1 --- includes/EditPage.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 292d2b75ad..ad6c98d110 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1250,7 +1250,7 @@ class EditPage { try { # Construct Content object $textbox_content = $this->toEditContent( $this->textbox1 ); - } catch (MWContentSerializationException $ex) { + } catch ( MWContentSerializationException $ex ) { $status->fatal( 'content-failed-to-parse', $this->contentModel, $this->contentFormat, $ex->getMessage() ); $status->value = self::AS_PARSE_ERROR; wfProfileOut( __METHOD__ ); @@ -1672,8 +1672,7 @@ class EditPage { } /** - * @private - * @todo document + * Attempts to merge text content with base and current revisions * * @param $editText string * @@ -1695,12 +1694,15 @@ class EditPage { } /** - * @private - * @todo document + * Attempts to do 3-way merge of edit content with a base revision + * and current content, in case of edit conflict, in whichever way appropriate + * for the content type. + * + * @since 1.21 * * @param $editContent + * * @return bool - * @since since 1.WD */ private function mergeChangesIntoContent( &$editContent ){ wfProfileIn( __METHOD__ ); -- 2.20.1