aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/extension
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-18 10:42:21 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-18 10:45:08 +0200
commitc220fa89a1bf5652df6512ad78eb9ba550fe465e (patch)
tree78f38853c04b3cb15d074a06886d448968615b39 /phpBB/phpbb/extension
parent53e028ff1485bac571982a56200412fadb72dc83 (diff)
downloadforums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar
forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar.gz
forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar.bz2
forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar.xz
forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.zip
[ticket/12963] Revert back to "migrations" folder name for extensions
The issues that can be created with the name change are just too much PHPBB3-12963
Diffstat (limited to 'phpBB/phpbb/extension')
-rw-r--r--phpBB/phpbb/extension/base.php11
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;
}