mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Merge remote-tracking branch 'EXreaction/ticket/11396' into develop
* EXreaction/ticket/11396: [ticket/11396] Rename insert_migration to set_migration_state
This commit is contained in:
commit
5695097b8a
1 changed files with 4 additions and 4 deletions
|
@ -174,7 +174,7 @@ class phpbb_db_migrator
|
||||||
'migration_start_time' => time(),
|
'migration_start_time' => time(),
|
||||||
'migration_end_time' => time(),
|
'migration_end_time' => time(),
|
||||||
);
|
);
|
||||||
$this->insert_migration($name, $state);
|
$this->set_migration_state($name, $state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -350,7 +350,7 @@ class phpbb_db_migrator
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->insert_migration($name, $state);
|
$this->set_migration_state($name, $state);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -422,7 +422,7 @@ class phpbb_db_migrator
|
||||||
$state['migration_data_done'] = ($result === true) ? false : true;
|
$state['migration_data_done'] = ($result === true) ? false : true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->insert_migration($name, $state);
|
$this->set_migration_state($name, $state);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -641,7 +641,7 @@ class phpbb_db_migrator
|
||||||
* @param array $state
|
* @param array $state
|
||||||
* @return null
|
* @return null
|
||||||
*/
|
*/
|
||||||
protected function insert_migration($name, $state)
|
protected function set_migration_state($name, $state)
|
||||||
{
|
{
|
||||||
$migration_row = $state;
|
$migration_row = $state;
|
||||||
$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
|
$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
|
||||||
|
|
Loading…
Add table
Reference in a new issue