diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-28 10:27:16 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-28 10:27:16 -0600 |
| commit | 11ca2c15d68629d5b7daa5402fe33e54c1286c49 (patch) | |
| tree | 72432044db87e6e777850ae0336b8df7aa189fde /phpBB/includes/db/migrator.php | |
| parent | e5417ec123d62c414765341d98505213456d0b81 (diff) | |
| parent | 1eead4da97635df35bfcdd6b1ce7ed71d9851d41 (diff) | |
| download | forums-11ca2c15d68629d5b7daa5402fe33e54c1286c49.tar forums-11ca2c15d68629d5b7daa5402fe33e54c1286c49.tar.gz forums-11ca2c15d68629d5b7daa5402fe33e54c1286c49.tar.bz2 forums-11ca2c15d68629d5b7daa5402fe33e54c1286c49.tar.xz forums-11ca2c15d68629d5b7daa5402fe33e54c1286c49.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
[ticket/11363] Fix a couple bugs and throw errors if the file not found
[ticket/11372] Migrator should only check if effectively installed if not
[ticket/11363] Load module info files for extensions too
Diffstat (limited to 'phpBB/includes/db/migrator.php')
| -rw-r--r-- | phpBB/includes/db/migrator.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php index 89b253bc8c..ec0b6a87da 100644 --- a/phpBB/includes/db/migrator.php +++ b/phpBB/includes/db/migrator.php @@ -316,20 +316,20 @@ class phpbb_db_migrator 'class' => $migration, ); - if ($migration->effectively_installed()) + if (!isset($this->migration_state[$name])) { - $state = array( - 'migration_depends_on' => $migration->depends_on(), - 'migration_schema_done' => true, - 'migration_data_done' => true, - 'migration_data_state' => '', - 'migration_start_time' => 0, - 'migration_end_time' => 0, - ); - } - else - { - if (!isset($this->migration_state[$name])) + if ($migration->effectively_installed()) + { + $state = array( + 'migration_depends_on' => $migration->depends_on(), + 'migration_schema_done' => true, + 'migration_data_done' => true, + 'migration_data_state' => '', + 'migration_start_time' => 0, + 'migration_end_time' => 0, + ); + } + else { $state['migration_start_time'] = time(); } |