X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FBlock.php;h=a7b80352b3f9a2f428f1ae7f90d93ffe7e51c3d7;hb=377ce5a469476a0ec68a6f03e3f5714eb40caeff;hp=4e878d1045ba41a8a1f1f2c92f0bdea0cff80dde;hpb=9c5f56ef68cc4713f65973058dc56d2c7b9d0cf9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Block.php b/includes/Block.php
index 4e878d1045..a7b80352b3 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -224,7 +224,7 @@ class Block {
 			'ipb_address',
 			'ipb_by',
 			'ipb_by_text',
-			'ipb_by_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'ipb_by_actor' : null,
+			'ipb_by_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'ipb_by_actor' : 'NULL',
 			'ipb_timestamp',
 			'ipb_auto',
 			'ipb_anon_only',
@@ -458,7 +458,7 @@ class Block {
 	protected function initFromRow( $row ) {
 		$this->setTarget( $row->ipb_address );
 		$this->setBlocker( User::newFromAnyId(
-			$row->ipb_by, $row->ipb_by_text, isset( $row->ipb_by_actor ) ? $row->ipb_by_actor : null
+			$row->ipb_by, $row->ipb_by_text, $row->ipb_by_actor ?? null
 		) );
 
 		$this->mTimestamp = wfTimestamp( TS_MW, $row->ipb_timestamp );
@@ -521,7 +521,7 @@ class Block {
 	 *
 	 * @param IDatabase $dbw If you have one available
 	 * @return bool|array False on failure, assoc array on success:
-	 *	('id' => block ID, 'autoIds' => array of autoblock IDs)
+	 * 	('id' => block ID, 'autoIds' => array of autoblock IDs)
 	 */
 	public function insert( $dbw = null ) {
 		global $wgBlockDisablesLogin;
@@ -1134,7 +1134,7 @@ class Block {
 			return;
 		}
 
-		DeferredUpdates::addUpdate( new AtomicSectionUpdate(
+		DeferredUpdates::addUpdate( new AutoCommitUpdate(
 			wfGetDB( DB_MASTER ),
 			__METHOD__,
 			function ( IDatabase $dbw, $fname ) {