1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2017-10-17 19:54:24 +02:00
4 changed files with 141 additions and 2 deletions

View File

@@ -503,11 +503,14 @@ class migrator
return;
}
foreach ($this->migration_state as $name => $state)
foreach ($this->migrations as $name)
{
if (!empty($state['migration_depends_on']) && in_array($migration, $state['migration_depends_on']))
$state = $this->migration_state($name);
if ($state && in_array($migration, $state['migration_depends_on']) && ($state['migration_schema_done'] || $state['migration_data_done']))
{
$this->revert_do($name);
return;
}
}