X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRevision.php;h=537b7c11a69b85dca630eb65597fea309e096c71;hb=7e18aed900995b8066e382eec331aea04c133770;hp=bae974f15c5f5cbe1601473c38b344237df2610c;hpb=132c1ad73ffda918bbd1e011487765b80ddd2c9c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Revision.php b/includes/Revision.php
index bae974f15c..537b7c11a6 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDatabase;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
@@ -558,8 +559,6 @@ class Revision implements IDBAccessObject {
 	}
 
 	/**
-	 * Constructor
-	 *
 	 * @param object|array $row Either a database row or an array
 	 * @throws MWException
 	 * @access private
@@ -1003,7 +1002,7 @@ class Revision implements IDBAccessObject {
 
 		return RecentChange::newFromConds(
 			[
-				'rc_user_text' => $this->getUserText( Revision::RAW ),
+				'rc_user_text' => $this->getUserText( self::RAW ),
 				'rc_timestamp' => $dbr->timestamp( $this->getTimestamp() ),
 				'rc_this_oldid' => $this->getId()
 			],
@@ -1467,7 +1466,7 @@ class Revision implements IDBAccessObject {
 				? $this->getPreviousRevisionId( $dbw )
 				: $this->mParentId,
 			'rev_sha1'       => $this->mSha1 === null
-				? Revision::base36Sha1( $this->mText )
+				? self::base36Sha1( $this->mText )
 				: $this->mSha1,
 		];
 
@@ -1495,7 +1494,10 @@ class Revision implements IDBAccessObject {
 
 		$dbw->insert( 'revision', $row, __METHOD__ );
 
-		$this->mId = $rev_id !== null ? $rev_id : $dbw->insertId();
+		if ( $this->mId === null ) {
+			// Only if nextSequenceValue() was called
+			$this->mId = $dbw->insertId();
+		}
 
 		// Assertion to try to catch T92046
 		if ( (int)$this->mId === 0 ) {
@@ -1553,7 +1555,7 @@ class Revision implements IDBAccessObject {
 			}
 		}
 
-		$content = $this->getContent( Revision::RAW );
+		$content = $this->getContent( self::RAW );
 		$prefixedDBkey = $title->getPrefixedDBkey();
 		$revId = $this->mId;