diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:37:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:37:07 +0200 |
| commit | 5fa2d197566c0f443bbdd71101b6c7876158dea6 (patch) | |
| tree | b1284f0f3257d24a155efc974ab4b1482191b7e8 /phpBB/install | |
| parent | b82a39fea9c48cb36677ed0aaf2dcb5531848d31 (diff) | |
| parent | 4a06511d853024193435fd9b2e347ff292589420 (diff) | |
| download | forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.gz forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.bz2 forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.xz forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.zip | |
Merge branch 'develop-ascraeus' into develop
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. |