diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-12-19 14:23:12 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-12-19 14:23:12 +0100 |
| commit | 9a814e21aa33da1f1ed89dbeae7f9021b50331c5 (patch) | |
| tree | 4b5266bef8cc379ca15504ac2f7deae1fdc8f433 | |
| parent | 28969511d2c2942d8a5d4aebe3aede2ccb10c0ba (diff) | |
| parent | 9af2dc0b6bce0f7fa5440b08bd88ee9f559d31a2 (diff) | |
| download | forums-9a814e21aa33da1f1ed89dbeae7f9021b50331c5.tar forums-9a814e21aa33da1f1ed89dbeae7f9021b50331c5.tar.gz forums-9a814e21aa33da1f1ed89dbeae7f9021b50331c5.tar.bz2 forums-9a814e21aa33da1f1ed89dbeae7f9021b50331c5.tar.xz forums-9a814e21aa33da1f1ed89dbeae7f9021b50331c5.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v317.php | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index b85f9b49cb..c9e746c8f0 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-a2-dev" /> <property name="prevversion" value="3.2.0-a1" /> - <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" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/phpbb/db/migration/data/v31x/v317.php b/phpBB/phpbb/db/migration/data/v31x/v317.php new file mode 100644 index 0000000000..15ba2a1feb --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v317.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 v317 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v317rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.7')), + ); + } +} |