diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-10 12:01:01 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-10 12:01:01 +0200 |
| commit | a093c28d1adf18d10208f05fca18e2e653f03b80 (patch) | |
| tree | e80fae0f95bdbd650797ec6725e3a3010848e8c7 /phpBB/install/database_update.php | |
| parent | 297ab5c5260c37bf4db4f220911b4dc8f4ca2674 (diff) | |
| download | forums-a093c28d1adf18d10208f05fca18e2e653f03b80.tar forums-a093c28d1adf18d10208f05fca18e2e653f03b80.tar.gz forums-a093c28d1adf18d10208f05fca18e2e653f03b80.tar.bz2 forums-a093c28d1adf18d10208f05fca18e2e653f03b80.tar.xz forums-a093c28d1adf18d10208f05fca18e2e653f03b80.zip | |
[ticket/12963] Fix the list of migrations in database_update.php
Without this patch the finder grab all the class available in the ext
folder and not only the migrations. This change is backported for the one
done before to the cli tool db:migrate. (see the commit
3420f8f3201ac337434f73ee00bda6df7b378212)
PHPBB3-12963
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6a91033dbb..7299c0aa2a 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -181,7 +181,17 @@ $finder = $phpbb_extension_manager->get_finder(); $migrations = $finder ->core_path('phpbb/db/migration/data/') + ->extension_directory('/migrations') ->get_classes(); + +// @deprecated to be removed in 3.2 final +$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. |