1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01: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:
Andreas Fischer 2013-03-04 18:52:50 +01:00
commit 5695097b8a

View File

@ -174,7 +174,7 @@ class phpbb_db_migrator
'migration_start_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;
}
@ -422,7 +422,7 @@ class phpbb_db_migrator
$state['migration_data_done'] = ($result === true) ? false : true;
}
$this->insert_migration($name, $state);
$this->set_migration_state($name, $state);
}
else
{
@ -641,7 +641,7 @@ class phpbb_db_migrator
* @param array $state
* @return null
*/
protected function insert_migration($name, $state)
protected function set_migration_state($name, $state)
{
$migration_row = $state;
$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);