diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-04 15:22:29 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-04 15:22:29 -0500 |
| commit | 1148f3fca51efb60e536f2fe0d51880610f0812b (patch) | |
| tree | 1645796b4357b5a96c37654eb38d8562c664b67d /phpBB/install | |
| parent | 1a8f72fd659b6c3cc3fd1c59446cd1663a89b110 (diff) | |
| parent | c1840c78c5ea2967dfc1912665ec19ebc25c22c6 (diff) | |
| download | forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.gz forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.bz2 forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.xz forums-1148f3fca51efb60e536f2fe0d51880610f0812b.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386-3:
[ticket/11386] Fix missing ;
[ticket/11386] Send list of migrations instead of using load_migrations
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 8 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6c8a95a413..3382e57e76 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -210,7 +210,13 @@ if (!$db_tools->sql_table_exists($table_prefix . 'migrations')) } $migrator = $phpbb_container->get('migrator'); -$migrator->load_migrations($phpbb_root_path . 'includes/db/migration/data/'); +$extension_manager = $phpbb_container->get('ext.manager'); +$finder = $extension_manager->get_finder(); + +$migrations = $finder + ->core_path('includes/db/migration/data/') + ->get_classes(); +$migrator->set_migrations($migrations); // What is a safe limit of execution time? Half the max execution time should be safe. $safe_time_limit = (ini_get('max_execution_time') / 2); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index f0280acc40..4cc154509c 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -114,7 +114,7 @@ class install_install extends module $this->add_bots($mode, $sub); $this->email_admin($mode, $sub); $this->disable_avatars_if_unwritable(); - $this->populate_migrations($phpbb_container->get('migrator'), $phpbb_root_path); + $this->populate_migrations($phpbb_container->get('ext.manager'), $phpbb_container->get('migrator')); // Remove the lock file @unlink($phpbb_root_path . 'cache/install_lock'); @@ -1888,12 +1888,17 @@ class install_install extends module * "installs" means it adds all migrations to the migrations table, but does not * perform any of the actions in the migrations. * + * @param phpbb_extension_manager $extension_manager * @param phpbb_db_migrator $migrator - * @param string $phpbb_root_path */ - function populate_migrations($migrator, $phpbb_root_path) + function populate_migrations($extension_manager, $migrator) { - $migrator->populate_migrations_from_directory($phpbb_root_path . 'includes/db/migration/data/'); + $finder = $extension_manager->get_finder(); + + $migrations = $finder + ->core_path('includes/db/migration/data/') + ->get_classes(); + $migrator->populate_migrations($migrations); } /** |