aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorNathan <nathaniel.guse@gmail.com>2013-10-02 14:27:46 -0500
committerNathan <nathaniel.guse@gmail.com>2013-10-02 14:27:46 -0500
commit621e6c93ed5517cedbf7a6a37c35786a1e2f27e8 (patch)
tree58fbec041af7239c6799aa3ba5694515af22525c /phpBB/phpbb
parent49ce2c13b26e358b4ccef440094a8fa4b6b9afd7 (diff)
downloadforums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar
forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar.gz
forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar.bz2
forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.tar.xz
forums-621e6c93ed5517cedbf7a6a37c35786a1e2f27e8.zip
[ticket/11883] Report completed data step in migration as "Installing Data"
PHPBB3-11883
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migrator.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 7efb23a230..acfd943e56 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -204,6 +204,7 @@ class migrator
'name' => $name,
'class' => $migration,
'state' => $state,
+ 'task' => '',
);
if (!isset($this->migration_state[$name]))
@@ -231,6 +232,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;
}
@@ -238,6 +240,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;
@@ -308,6 +311,7 @@ class migrator
$this->last_run_migration = array(
'name' => $name,
'class' => $migration,
+ 'task' => '',
);
if ($state['migration_data_done'])
@@ -626,6 +630,7 @@ class migrator
{
continue;
}
+
return false;
}