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/phpbb/extension/base.php | |
| 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/phpbb/extension/base.php')
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index b74026e6ab..5bb530bad4 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -132,19 +132,10 @@ class base implements \phpbb\extension\extension_interface // Only have the finder search in this extension path directory $migrations = $this->extension_finder - ->extension_directory('/migration') - ->find_from_extension($this->extension_name, $this->extension_path); - - $migrations = $this->extension_finder->get_classes_from_files($migrations); - - // @deprecated 3.1.0-RC4 (To be removed: 3.2.0) - $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); + $migrations = $this->extension_finder->get_classes_from_files($migrations); return $migrations; } |