diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-12-28 22:00:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-12-28 22:00:13 +0100 |
| commit | 90210bf37186c6845c377a5dc5547c80aab7a552 (patch) | |
| tree | 52e17faafd4f85e30d68677ba71dcfe13b45731b /phpBB/phpbb | |
| parent | 1f1835ede00b67f1de94df2018ee281143224a22 (diff) | |
| parent | 39b142077478876b4c2ef270c081681070f264d7 (diff) | |
| download | forums-90210bf37186c6845c377a5dc5547c80aab7a552.tar forums-90210bf37186c6845c377a5dc5547c80aab7a552.tar.gz forums-90210bf37186c6845c377a5dc5547c80aab7a552.tar.bz2 forums-90210bf37186c6845c377a5dc5547c80aab7a552.tar.xz forums-90210bf37186c6845c377a5dc5547c80aab7a552.zip | |
Merge branch 'prep-release-3.2.2' into 3.2.x
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v32x/v321.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v32x/v322rc1.php | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v32x/v321.php b/phpBB/phpbb/db/migration/data/v32x/v321.php index 268f978b4b..fdbb5cff19 100644 --- a/phpBB/phpbb/db/migration/data/v32x/v321.php +++ b/phpBB/phpbb/db/migration/data/v32x/v321.php @@ -23,6 +23,7 @@ class v321 extends \phpbb\db\migration\migration static public function depends_on() { return array( + '\phpbb\db\migration\data\v31x\v3111', '\phpbb\db\migration\data\v32x\v321rc1', ); diff --git a/phpBB/phpbb/db/migration/data/v32x/v322rc1.php b/phpBB/phpbb/db/migration/data/v32x/v322rc1.php new file mode 100644 index 0000000000..51e9f5fcaa --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/v322rc1.php @@ -0,0 +1,40 @@ +<?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\v32x; + +class v322rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.2.2-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\fix_user_styles', + '\phpbb\db\migration\data\v32x\update_prosilver_bitfield', + '\phpbb\db\migration\data\v32x\email_force_sender', + '\phpbb\db\migration\data\v32x\f_list_topics_permission_add', + '\phpbb\db\migration\data\v32x\merge_duplicate_bbcodes', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.2-RC1')), + ); + } +} |