Merge fabef37d71 into 081f2391cb

Merge pull request #6836 from rxu/ticket/17533
[ticket/17533] Fix reverting migrations logic
2025-07-27 04:18:55 +00:00 · 2025-07-18 08:50:26 +02:00 · 2025-07-07 17:35:37 +02:00 · 2025-07-07 11:02:30 +07:00
1 changed files with 1 additions and 1 deletions
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@ -551,7 +551,7 @@ class migrator
 				$state['migration_data_state']['_total_time'] : 0.0;
 			$elapsed_time = microtime(true);

-			$steps = array_merge($this->helper->reverse_update_data($migration->update_data()), $migration->revert_data());
+			$steps = $migration->revert_data() ?: $this->helper->reverse_update_data($migration->update_data());
 			$result = $this->process_data_step($steps, $state['migration_data_state']);

 			$elapsed_time = microtime(true) - $elapsed_time;
Author	SHA1	Message	Date
IdfbAn	54e6924e4f	Merge `fabef37d71` into `081f2391cb`	2025-07-18 08:50:26 +02:00
Marc Alexander	081f2391cb	Merge pull request #6836 from rxu/ticket/17533 [ticket/17533] Fix reverting migrations logic	2025-07-07 17:35:37 +02:00
rxu	0b242b9608	[ticket/17533] Fix reverting migrations logic Basically, prefer revert_data() if exists. PHPBB-17533	2025-07-07 11:02:30 +07:00