diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:36:38 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:36:38 +0200 |
| commit | 4a06511d853024193435fd9b2e347ff292589420 (patch) | |
| tree | aa3e98bfad040be23c232b235140e64ef8ce0d7f /phpBB/install | |
| parent | 2e1aebbc12bded1cb311394fe5acb5d8b13124c6 (diff) | |
| parent | 8b16d3141396a11db3ab4ade49af91f2477f5fb6 (diff) | |
| download | forums-4a06511d853024193435fd9b2e347ff292589420.tar forums-4a06511d853024193435fd9b2e347ff292589420.tar.gz forums-4a06511d853024193435fd9b2e347ff292589420.tar.bz2 forums-4a06511d853024193435fd9b2e347ff292589420.tar.xz forums-4a06511d853024193435fd9b2e347ff292589420.zip | |
Merge pull request #2932 from Nicofuma/ticket/12963
[ticket/12963] Load extensions migrations from /migration
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6a91033dbb..5cf01fec79 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -177,11 +177,21 @@ $migrator = $phpbb_container->get('migrator'); $migrator->create_migrations_table(); $phpbb_extension_manager = $phpbb_container->get('ext.manager'); -$finder = $phpbb_extension_manager->get_finder(); -$migrations = $finder +$migrations = $phpbb_extension_manager + ->get_finder() ->core_path('phpbb/db/migration/data/') + ->extension_directory('/migration') ->get_classes(); + +// @deprecated 3.1.0-RC4 (To be removed: 3.2.0) +$migrations_deprecated = $phpbb_extension_manager + ->get_finder() + ->extension_directory('/migrations') + ->get_classes(); + +$migrations = array_merge($migrations, $migrations_deprecated); + $migrator->set_migrations($migrations); // What is a safe limit of execution time? Half the max execution time should be safe. |