X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FRevision.php;h=c3782ba18a9af2f3a5de40e83b387938d0beec38;hb=e86a6310f748ae00d8575908b9f9eb2540a104aa;hp=486abd894e757bf220aae1d82527597b2bdbab95;hpb=8bf70505d2ce37f91e3e55962d526a43d72edf96;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Revision.php b/includes/Revision.php
index 486abd894e..c3782ba18a 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -19,6 +19,9 @@
  *
  * @file
  */
+
+use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\ResultWrapper;
@@ -1493,7 +1496,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 ) {