makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14742] Avoid loop while reverting schema

Browse source 
PHPBB3-14742
This commit is contained in:
Oliver Schramm 2016-08-11 16:38:56 +02:00
parent b00a39b9ad
commit 52afa74f4e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/phpbb/db/migrator.php
View file

@ -457,8 +457,13 @@ class migrator
WHERE migration_name = '" . $this->db->sql_escape($name) . "'"; WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
$this->db->sql_query($sql); $this->db->sql_query($sql);
$this->last_run_migration = false;
unset($this->migration_state[$name]); unset($this->migration_state[$name]);
} }
else
{
$this->set_migration_state($name, $state);
}
} }
return true; return true;
@ -503,8 +508,8 @@ class migrator
// Set state to false since we reached the point we were at // Set state to false since we reached the point we were at
$state = false; $state = false;
// There is a programmed tendency to get stuck in this case // There is a tendency to get stuck in some cases
if (strpos($step[0], 'dbtools') === 0 && ($last_result === null || $last_result === true)) if ($last_result === null || $last_result === true)
{ {
continue; continue;
} }