diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-12-19 14:21:57 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-12-19 14:21:57 +0100 |
| commit | 9af2dc0b6bce0f7fa5440b08bd88ee9f559d31a2 (patch) | |
| tree | b0b616a9870b63a4ac829264ac79ea34eb3c6b70 | |
| parent | 67f3017274fdc749c9e5c75930dd15e3b1d0317d (diff) | |
| parent | e3acdfed925a7d924de038e1101a960c7d9391d3 (diff) | |
| download | forums-9af2dc0b6bce0f7fa5440b08bd88ee9f559d31a2.tar forums-9af2dc0b6bce0f7fa5440b08bd88ee9f559d31a2.tar.gz forums-9af2dc0b6bce0f7fa5440b08bd88ee9f559d31a2.tar.bz2 forums-9af2dc0b6bce0f7fa5440b08bd88ee9f559d31a2.tar.xz forums-9af2dc0b6bce0f7fa5440b08bd88ee9f559d31a2.zip | |
Merge branch 'prep-release-3.1.7' 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/v317.php | 31 |
2 files changed, 33 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index f6affbf055..b8a88473ba 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.8-dev" /> - <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" /> + <property name="prevversion" value="3.1.7" /> + <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" /> <!-- 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')), + ); + } +} |