diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-10 12:08:13 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-10 19:21:57 +0200 |
| commit | 72ee4b3a7c4fca67cb226dab3ed27a8afa903144 (patch) | |
| tree | 7468ef79c1272d1794be0acc2374262e5362d97b /phpBB/phpbb/extension | |
| parent | ff872a79707200ed7e3e7c25b4ebc7f6f4313b6c (diff) | |
| download | forums-72ee4b3a7c4fca67cb226dab3ed27a8afa903144.tar forums-72ee4b3a7c4fca67cb226dab3ed27a8afa903144.tar.gz forums-72ee4b3a7c4fca67cb226dab3ed27a8afa903144.tar.bz2 forums-72ee4b3a7c4fca67cb226dab3ed27a8afa903144.tar.xz forums-72ee4b3a7c4fca67cb226dab3ed27a8afa903144.zip | |
[ticket/12963] Load extensions migrations from /migration
PHPBB3-12963
Diffstat (limited to 'phpBB/phpbb/extension')
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index e0ccb4c65b..9cd37ec8b2 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -132,10 +132,20 @@ class base implements \phpbb\extension\extension_interface // Only have the finder search in this extension path directory $migrations = $this->extension_finder - ->extension_directory('/migrations') + ->extension_directory('/migration') ->find_from_extension($this->extension_name, $this->extension_path); + $migrations = $this->extension_finder->get_classes_from_files($migrations); + // @deprecated to be removed in 3.2 final + $migrations_deprecated = $this->extension_finder + ->extension_directory('/migrations') + ->find_from_extension($this->extension_name, $this->extension_path); + + $migrations_deprecated = $this->extension_finder->get_classes_from_files($migrations_deprecated); + + $migrations = array_merge($migrations, $migrations_deprecated); + return $migrations; } } |