mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 12:22:03 +02:00
Code Issues Releases Wiki Activity

[ticket/14742] Small fixes to migrator

Browse Source 
PHPBB3-14742
This commit is contained in:
Oliver Schramm 2016-08-10 14:57:33 +02:00
parent 8e1461ca61
commit a277f9cf07
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}
}