diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:44:57 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:44:57 +0100 |
commit | f4898b9258c8365f3aae7fc945c3f156ec9f0ad4 (patch) | |
tree | 60a4460f17d51ea6364c6267b4e95bf92324fa55 /phpBB/phpbb/db | |
parent | 5c3b6a855944d7a370186987ebebe3a896cf76a2 (diff) | |
parent | 9c9623e47f179e2fee386e939d98e5428ac68a44 (diff) | |
download | forums-f4898b9258c8365f3aae7fc945c3f156ec9f0ad4.tar forums-f4898b9258c8365f3aae7fc945c3f156ec9f0ad4.tar.gz forums-f4898b9258c8365f3aae7fc945c3f156ec9f0ad4.tar.bz2 forums-f4898b9258c8365f3aae7fc945c3f156ec9f0ad4.tar.xz forums-f4898b9258c8365f3aae7fc945c3f156ec9f0ad4.zip |
Merge branch 'prep-release-3.1.2' into develop-ascraeus
Diffstat (limited to 'phpBB/phpbb/db')
-rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v312.php | 31 | ||||
-rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v312rc1.php | 32 |
2 files changed, 63 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v312.php b/phpBB/phpbb/db/migration/data/v31x/v312.php new file mode 100644 index 0000000000..12a3ec3ae6 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v312.php @@ -0,0 +1,31 @@ +<?php +/** + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited <https://www.phpbb.com> + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v31x; + +class v312 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v312rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.2')), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v31x/v312rc1.php b/phpBB/phpbb/db/migration/data/v31x/v312rc1.php new file mode 100644 index 0000000000..d4b133fc01 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v312rc1.php @@ -0,0 +1,32 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v312rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v311', + '\phpbb\db\migration\data\v31x\m_softdelete_global', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.2-RC1')), + ); + } +} |