diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2016-08-10 14:57:33 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2016-08-11 01:09:11 +0200 |
| commit | a277f9cf07f73e5f4563d248d1bb4eed49a7e4c9 (patch) | |
| tree | 2c047cce9a1e7e1276b29893515b28eec84b0a5d /phpBB | |
| parent | 8e1461ca61e3f452935a1253d3afe65e7322d6bc (diff) | |
| download | forums-a277f9cf07f73e5f4563d248d1bb4eed49a7e4c9.tar forums-a277f9cf07f73e5f4563d248d1bb4eed49a7e4c9.tar.gz forums-a277f9cf07f73e5f4563d248d1bb4eed49a7e4c9.tar.bz2 forums-a277f9cf07f73e5f4563d248d1bb4eed49a7e4c9.tar.xz forums-a277f9cf07f73e5f4563d248d1bb4eed49a7e4c9.zip | |
[ticket/14742] Small fixes to migrator
PHPBB3-14742
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 3e69d9613e..8637f71414 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -87,7 +87,7 @@ class migrator * * @var migrator_output_handler_interface */ - public $output_handler; + protected $output_handler; /** * Constructor of the database migrator @@ -333,7 +333,7 @@ class migrator $state['migration_data_done'] = ($result === true); $state['migration_end_time'] = ($result === true) ? time() : 0; - if ($state['migration_schema_done']) + if ($state['migration_data_done']) { $this->output_handler->write(array('MIGRATION_DATA_DONE', $name, $elapsed_time), migrator_output_handler_interface::VERBOSITY_NORMAL); } @@ -347,7 +347,6 @@ class migrator // Revert the schema changes $this->revert_do($name); - // Rethrow exception throw $e; } } @@ -518,7 +517,6 @@ class migrator $result = $this->run_step($reverse_step, false, !$revert); } - // rethrow the exception throw $e; } } |