X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=inline;f=includes%2Fdb%2FDatabaseOracle.php;h=225a36c421b3e579c2d375f6e1280e4cde0dd206;hb=27c61fb1e94da9114314468fd00bcf129ec064b6;hp=156e315833e65fe59e93466fe20e3da36a313b9d;hpb=0c712ce564e0bd53e28f2581a714ee8cd04b614c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 156e315833..225a36c421 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1179,13 +1179,16 @@ class DatabaseOracle extends Database {
 	}
 
 	public function delete( $table, $conds, $fname = __METHOD__ ) {
+		global $wgActorTableSchemaMigrationStage;
+
 		if ( is_array( $conds ) ) {
 			$conds = $this->wrapConditionsForWhere( $table, $conds );
 		}
 		// a hack for deleting pages, users and images (which have non-nullable FKs)
 		// all deletions on these tables have transactions so final failure rollbacks these updates
+		// @todo: Normalize the schema to match MySQL, no special FKs and such
 		$table = $this->tableName( $table );
-		if ( $table == $this->tableName( 'user' ) ) {
+		if ( $table == $this->tableName( 'user' ) && $wgActorTableSchemaMigrationStage < MIGRATION_NEW ) {
 			$this->update( 'archive', [ 'ar_user' => 0 ],
 				[ 'ar_user' => $conds['user_id'] ], $fname );
 			$this->update( 'ipblocks', [ 'ipb_user' => 0 ],