diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-02-18 18:38:43 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-02-18 18:38:43 +0100 |
| commit | fc66f00236230d41362dd63286641e8faffd0f99 (patch) | |
| tree | bdefdc37112be44eb36edc69e6d5d8cd7fc05f9c | |
| parent | 17e21d5140ccb99363a32bd64c32af6012c1ce97 (diff) | |
| parent | 9745d8d80e05f755bb8188077d042a2a69e8c21f (diff) | |
| download | forums-fc66f00236230d41362dd63286641e8faffd0f99.tar forums-fc66f00236230d41362dd63286641e8faffd0f99.tar.gz forums-fc66f00236230d41362dd63286641e8faffd0f99.tar.bz2 forums-fc66f00236230d41362dd63286641e8faffd0f99.tar.xz forums-fc66f00236230d41362dd63286641e8faffd0f99.zip | |
Merge branch 'prep-release-3.1.8' 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/composer.lock | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v318.php | 31 |
3 files changed, 35 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml index 29afe03011..1827fe8ab3 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.9-dev" /> - <property name="prevversion" value="3.1.7-pl1" /> - <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-RC1, 3.1.7" /> + <property name="newversion" value="3.1.8" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 0d489a22da..b0545cb2a6 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "5864f5064e1ca81dd9817ee2674b5dfd", + "hash": "33fa9de480a8a9c8f7e3f2926cd4c034", "packages": [ { "name": "lusitanian/oauth", @@ -2307,7 +2307,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.3.3" + "php": ">=5.3.3,<7.0" }, "platform-dev": [] } diff --git a/phpBB/phpbb/db/migration/data/v31x/v318.php b/phpBB/phpbb/db/migration/data/v31x/v318.php new file mode 100644 index 0000000000..b254279a5d --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v318.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 v318 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v318rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.8')), + ); + } +} |