X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=74ec883a0629eead6dd1150a5a3fce41ce93b1f1;hb=807d793ab907984c9f347df9d672aadb5db78b38;hp=d27ef9c7a936e2f22f94abaccd47fe44e26c6513;hpb=bd1d2b8529501d00080c534e245479747a097604;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d27ef9c7a9..74ec883a06 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -25,6 +25,7 @@ use MediaWiki\EditPage\TextboxBuilder;
 use MediaWiki\EditPage\TextConflictHelper;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
 use Wikimedia\ScopedCallback;
 
 /**
@@ -621,7 +622,7 @@ class EditPage {
 			wfDebug( __METHOD__ . ": User can't edit\n" );
 
 			if ( $this->context->getUser()->getBlock() ) {
-				// track block with a cookie if it doesn't exists already
+				// Track block with a cookie if it doesn't exist already
 				MediaWikiServices::getInstance()->getBlockManager()
 					->trackBlockWithCookie( $this->context->getUser() );
 
@@ -1222,8 +1223,8 @@ class EditPage {
 				# the revisions exist and they were not deleted.
 				# Otherwise, $content will be left as-is.
 				if ( !is_null( $undorev ) && !is_null( $oldrev ) &&
-					!$undorev->isDeleted( Revision::DELETED_TEXT ) &&
-					!$oldrev->isDeleted( Revision::DELETED_TEXT )
+					!$undorev->isDeleted( RevisionRecord::DELETED_TEXT ) &&
+					!$oldrev->isDeleted( RevisionRecord::DELETED_TEXT )
 				) {
 					if ( WikiPage::hasDifferencesOutsideMainSlot( $undorev, $oldrev )
 						|| !$this->isSupportedContentModel( $oldrev->getContentModel() )
@@ -1245,7 +1246,7 @@ class EditPage {
 					}
 
 					if ( $undoMsg === null ) {
-						$oldContent = $this->page->getContent( Revision::RAW );
+						$oldContent = $this->page->getContent( RevisionRecord::RAW );
 						$popts = ParserOptions::newFromUserAndLang(
 							$user, MediaWikiServices::getInstance()->getContentLanguage() );
 						$newContent = $content->preSaveTransform( $this->mTitle, $user, $popts );
@@ -1371,7 +1372,7 @@ class EditPage {
 			$handler = ContentHandler::getForModelID( $this->contentModel );
 			return $handler->makeEmptyContent();
 		}
-		$content = $revision->getContent( Revision::FOR_THIS_USER, $user );
+		$content = $revision->getContent( RevisionRecord::FOR_THIS_USER, $user );
 		return $content;
 	}
 
@@ -1405,7 +1406,7 @@ class EditPage {
 	 */
 	protected function getCurrentContent() {
 		$rev = $this->page->getRevision();
-		$content = $rev ? $rev->getContent( Revision::RAW ) : null;
+		$content = $rev ? $rev->getContent( RevisionRecord::RAW ) : null;
 
 		if ( $content === false || $content === null ) {
 			$handler = ContentHandler::getForModelID( $this->contentModel );
@@ -1496,7 +1497,7 @@ class EditPage {
 		}
 
 		$parserOptions = ParserOptions::newFromUser( $user );
-		$content = $page->getContent( Revision::RAW );
+		$content = $page->getContent( RevisionRecord::RAW );
 
 		if ( !$content ) {
 			// TODO: somehow show a warning to the user!
@@ -3139,12 +3140,12 @@ ERROR;
 				if ( $revision ) {
 					// Let sysop know that this will make private content public if saved
 
-					if ( !$revision->userCan( Revision::DELETED_TEXT, $user ) ) {
+					if ( !$revision->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
 						$out->wrapWikiMsg(
 							"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
 							'rev-deleted-text-permission'
 						);
-					} elseif ( $revision->isDeleted( Revision::DELETED_TEXT ) ) {
+					} elseif ( $revision->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
 						$out->wrapWikiMsg(
 							"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
 							'rev-deleted-text-view'