diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-10-04 20:40:30 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-10-04 20:40:30 +0530 |
| commit | e8c7f8134df38708e1af27325d2c8a7b9f28052e (patch) | |
| tree | ccc4d190b929df13110ecff6801a741f8f93c12d /phpBB/phpbb | |
| parent | fdae60c146be5cf04dd1cbd318016a3a3301d122 (diff) | |
| parent | 3259bd1196ca2a7f77fe7060e5510813e7844ebd (diff) | |
| download | forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar.gz forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar.bz2 forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.tar.xz forums-e8c7f8134df38708e1af27325d2c8a7b9f28052e.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11883' into develop
# 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"
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 9879ff2a85..47e1406043 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -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; } |