diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-04-16 12:48:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-04-16 12:48:56 +0200 |
| commit | 4cdec74e94728605089587f2fd0667b3b3e4e558 (patch) | |
| tree | bccadf7261b793b66fae5d8ad7c9939dbf01c9fd | |
| parent | ed378a2ec33836580f974dc6e805ce864435225d (diff) | |
| parent | 1b01667c7b7d905c95c7412c5d5e15bf7a20975f (diff) | |
| download | forums-4cdec74e94728605089587f2fd0667b3b3e4e558.tar forums-4cdec74e94728605089587f2fd0667b3b3e4e558.tar.gz forums-4cdec74e94728605089587f2fd0667b3b3e4e558.tar.bz2 forums-4cdec74e94728605089587f2fd0667b3b3e4e558.tar.xz forums-4cdec74e94728605089587f2fd0667b3b3e4e558.zip | |
Merge branch 'prep-release-3.1.9' into 3.1.x
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v319.php | 36 |
2 files changed, 38 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index ccbec845c5..c412a747ac 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.10-dev" /> - <property name="prevversion" 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" /> + <property name="prevversion" value="3.1.9" /> + <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" /> <!-- 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')), + ); + } +} |