diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:47:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:47:22 +0100 |
| commit | 1a0cba1099a554323391d7dc43004cbcaaf3ade8 (patch) | |
| tree | 7bf336e4acde626b03a1962d955a96b1070467ca /phpBB/phpbb/db | |
| parent | 8f67892f5ef63144f394b6913aeaa9ca3479d33d (diff) | |
| parent | f4898b9258c8365f3aae7fc945c3f156ec9f0ad4 (diff) | |
| download | forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.gz forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.bz2 forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.xz forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
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')), + ); + } +} |