diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-16 03:14:39 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-16 03:14:39 +0200 |
| commit | 09cfa01d589ead86cf811e27b52167539e0478ec (patch) | |
| tree | 8499d90aa8cd98f891fa9cc79a80c5a7a0a30018 /phpBB/phpbb/db | |
| parent | 2472271bc0cd7c15c77783c86ccaac643ab1756a (diff) | |
| download | forums-09cfa01d589ead86cf811e27b52167539e0478ec.tar forums-09cfa01d589ead86cf811e27b52167539e0478ec.tar.gz forums-09cfa01d589ead86cf811e27b52167539e0478ec.tar.bz2 forums-09cfa01d589ead86cf811e27b52167539e0478ec.tar.xz forums-09cfa01d589ead86cf811e27b52167539e0478ec.zip | |
[ticket/11700] Fix installation after develop merge
PHPBB3-11700
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php (renamed from phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php) | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/mod_rewrite.php (renamed from phpBB/phpbb/db/migration/data/310/mod_rewrite.php) | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/notifications_cron.php (renamed from phpBB/phpbb/db/migration/data/310/notifications_cron.php) | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php (renamed from phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php) | 8 |
4 files changed, 16 insertions, 8 deletions
diff --git a/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php b/phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php index cad1c16bb2..971a7e8504 100644 --- a/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php +++ b/phpBB/phpbb/db/migration/data/v310/auth_provider_oauth.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class auth_provider_oauth extends \phpbb\db\migration\migration { public function effectively_installed() { diff --git a/phpBB/phpbb/db/migration/data/310/mod_rewrite.php b/phpBB/phpbb/db/migration/data/v310/mod_rewrite.php index 85ce25abf3..ffb790b135 100644 --- a/phpBB/phpbb/db/migration/data/310/mod_rewrite.php +++ b/phpBB/phpbb/db/migration/data/v310/mod_rewrite.php @@ -7,12 +7,14 @@ * */ -class phpbb_db_migration_data_310_mod_rewrite extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class mod_rewrite extends \phpbb\db\migration\migration { static public function depends_on() { return array( - 'phpbb_db_migration_data_310_dev', + '\phpbb\db\migration\data\v310\dev', ); } diff --git a/phpBB/phpbb/db/migration/data/310/notifications_cron.php b/phpBB/phpbb/db/migration/data/v310/notifications_cron.php index 454628e50e..d5fa9c58a5 100644 --- a/phpBB/phpbb/db/migration/data/310/notifications_cron.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications_cron.php @@ -7,11 +7,13 @@ * */ -class phpbb_db_migration_data_310_notifications_cron extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class notifications_cron extends \phpbb\db\migration\migration { static public function depends_on() { - return array('phpbb_db_migration_data_310_notifications'); + return array('\phpbb\db\migration\data\v310\notifications'); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php b/phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php index f80f55d19a..2db9780601 100644 --- a/phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php +++ b/phpBB/phpbb/db/migration/data/v310/softdelete_mcp_modules.php @@ -7,7 +7,9 @@ * */ -class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migration +namespace phpbb\db\migration\data\v310; + +class softdelete_mcp_modules extends \phpbb\db\migration\migration { public function effectively_installed() { @@ -26,8 +28,8 @@ class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migrat static public function depends_on() { return array( - 'phpbb_db_migration_data_310_dev', - 'phpbb_db_migration_data_310_softdelete_p2', + 'phpbb\db\migration\data\v310\dev', + 'phpbb\db\migration\data\v310\softdelete_p2', ); } |