diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 14:04:22 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 14:04:22 +0200 |
| commit | 7548bc89eaefcc1e4774cf7aa1a827600ede5487 (patch) | |
| tree | 8cdfe3576f2dda55459911359d01b902e717d373 /phpBB/install | |
| parent | 374aa94be9cae13b06577dbd70d8c0c08f22f641 (diff) | |
| parent | bad07b355ca9f0d4cba4da5957a5cf3351523511 (diff) | |
| download | forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar.gz forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar.bz2 forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar.xz forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12963] Always use core_path and core_directory()
[ticket/12963] Remove old migration/ folder from tests
[ticket/12963] Revert back to "migrations" folder name for extensions
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5cf01fec79..8016ff349b 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -181,17 +181,9 @@ $phpbb_extension_manager = $phpbb_container->get('ext.manager'); $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. |