diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:37:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:37:07 +0200 |
| commit | 5fa2d197566c0f443bbdd71101b6c7876158dea6 (patch) | |
| tree | b1284f0f3257d24a155efc974ab4b1482191b7e8 /phpBB/phpbb/console/command/db/migrate.php | |
| parent | b82a39fea9c48cb36677ed0aaf2dcb5531848d31 (diff) | |
| parent | 4a06511d853024193435fd9b2e347ff292589420 (diff) | |
| download | forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.gz forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.bz2 forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.xz forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb/console/command/db/migrate.php')
| -rw-r--r-- | phpBB/phpbb/console/command/db/migrate.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php index c3caae5f70..68638a9515 100644 --- a/phpBB/phpbb/console/command/db/migrate.php +++ b/phpBB/phpbb/console/command/db/migrate.php @@ -117,8 +117,17 @@ class migrate extends \phpbb\console\command\command $migrations = $this->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 = $this->extension_manager + ->get_finder() ->extension_directory('/migrations') ->get_classes(); + + $migrations = array_merge($migrations, $migrations_deprecated); + $this->migrator->set_migrations($migrations); } |