diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-09-05 15:19:16 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-09-05 15:19:16 +0200 |
| commit | f201c22ca783f3652a81f05f4daddba53c13b499 (patch) | |
| tree | ce0f2085fe32f8740b265aacd16e4a07903cffb8 | |
| parent | 5faa12db4c4c02010e99c65e473024c018928603 (diff) | |
| parent | 5258fba2e02eefc5987320f2206f4fba22454b9c (diff) | |
| download | forums-f201c22ca783f3652a81f05f4daddba53c13b499.tar forums-f201c22ca783f3652a81f05f4daddba53c13b499.tar.gz forums-f201c22ca783f3652a81f05f4daddba53c13b499.tar.bz2 forums-f201c22ca783f3652a81f05f4daddba53c13b499.tar.xz forums-f201c22ca783f3652a81f05f4daddba53c13b499.zip | |
Merge branch 'prep-release-3.1.6' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v316.php | 31 |
2 files changed, 33 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 9c57110bdd..2d1a6eb51a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,8 +3,8 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> <property name="newversion" value="3.1.7-dev" /> - <property name="prevversion" value="3.1.5" /> - <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4" /> + <property name="prevversion" value="3.1.6" /> + <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/phpbb/db/migration/data/v31x/v316.php b/phpBB/phpbb/db/migration/data/v31x/v316.php new file mode 100644 index 0000000000..cec113eff2 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v316.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 v316 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v316rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.6')), + ); + } +} |