Merge "Make use of the new PageUpdateStatus"

1 files changed, 4 insertions, 5 deletions

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 3b36baddd702..e1c751dca09d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2594,7 +2594,6 @@ class EditPage implements IEditObject {
 				CommentStoreComment::newUnsavedComment( trim( $this->summary ) ),
 				$flags
 			);
-		/** @var Status $doEditStatus */
 		$doEditStatus = $pageUpdater->getStatus();
 
 		if ( !$doEditStatus->isOK() ) {
@@ -2602,9 +2601,9 @@ class EditPage implements IEditObject {
 			// Show the edit conflict page for certain recognized errors from doEdit(),
 			// but don't show it for errors from extension hooks
 			if (
-				$doEditStatus->hasMessage( 'edit-gone-missing' ) ||
-				$doEditStatus->hasMessage( 'edit-conflict' ) ||
-				$doEditStatus->hasMessage( 'edit-already-exists' )
+				$doEditStatus->failedBecausePageMissing() ||
+				$doEditStatus->failedBecausePageExists() ||
+				$doEditStatus->failedBecauseOfConflict()
 			) {
 				$this->isConflict = true;
 				// Destroys data doEdit() put in $status->value but who cares
@@ -2613,7 +2612,7 @@ class EditPage implements IEditObject {
 			return $doEditStatus;
 		}
 
-		$result['nullEdit'] = $doEditStatus->hasMessage( 'edit-no-change' );
+		$result['nullEdit'] = !$doEditStatus->wasRevisionCreated();
 		if ( $result['nullEdit'] ) {
 			// We don't know if it was a null edit until now, so increment here
 			$requestUser->pingLimiter( 'linkpurge' );