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 branch 'develop-ascraeus' into develop

Browse Source 
* 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
This commit is contained in:
Tristan Darricau
2014-09-18 14:04:22 +02:00
parent 374aa94be9 bad07b355c
commit 7548bc89ea
8 changed files with 5 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/install/database_update.php
View File

@@ -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.