mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11883' into develop

Browse Source 
# By Nathan (1) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11883:
  [ticket/11883] Only output the migration time, not total
  [ticket/11883] Report completed data step in migration as "Installing Data"
This commit is contained in:
Dhruv
2013-10-04 20:40:30 +05:30
parent fdae60c146 3259bd1196
commit e8c7f8134d
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/db/migrator.php
View File

@@ -209,6 +209,7 @@ class migrator
'name' => $name,
'class' => $migration,
'state' => $state,
'task' => '',
);
if (!isset($this->migration_state[$name]))
@@ -236,6 +237,7 @@ class migrator
if (!$state['migration_schema_done'])
{
$this->last_run_migration['task'] = 'apply_schema_changes';
$this->apply_schema_changes($migration->update_schema());
$state['migration_schema_done'] = true;
}
@@ -243,6 +245,7 @@ class migrator
{
try
{
$this->last_run_migration['task'] = 'process_data_step';
$result = $this->process_data_step($migration->update_data(), $state['migration_data_state']);
$state['migration_data_state'] = ($result === true) ? '' : $result;
@@ -313,6 +316,7 @@ class migrator
$this->last_run_migration = array(
'name' => $name,
'class' => $migration,
'task' => '',
);
if ($state['migration_data_done'])
@@ -631,6 +635,7 @@ class migrator
{
continue;
}
return false;
}