mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop

Browse Source 
# 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
This commit is contained in:
David King
2013-03-04 15:22:29 -05:00
parent 1a8f72fd65 c1840c78c5
commit 1148f3fca5
10 changed files with 159 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/install/database_update.php
View File

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

13
phpBB/install/install_install.php
View File

@@ -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);
}
/**