diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2016-04-16 12:50:31 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2016-04-16 12:50:31 +0200 |
commit | 29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1 (patch) | |
tree | 39c2d27a7b188e55c5c1ccc1379c7b7a36304ab9 | |
parent | 1b0b78dabc99a21e36921055b35069cd39de6e1d (diff) | |
parent | 4cdec74e94728605089587f2fd0667b3b3e4e558 (diff) | |
download | forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar.gz forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar.bz2 forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.tar.xz forums-29bb1ab72d68ff9a19cb3e1d99d4a4a9060e55a1.zip |
Merge branch '3.1.x' into 3.2.x
-rw-r--r-- | build/build.xml | 2 | ||||
-rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v319.php | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 205286c236..24d935ad90 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.2.0-b3-dev" /> <property name="prevversion" value="3.2.0-b2" /> - <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" /> + <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/phpbb/db/migration/data/v31x/v319.php b/phpBB/phpbb/db/migration/data/v31x/v319.php new file mode 100644 index 0000000000..f773814028 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v319.php @@ -0,0 +1,36 @@ +<?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 v319 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.1.9', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v319rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.9')), + ); + } +} |