diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:34 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:34 +0200 |
| commit | 36abb61d39c09ecc00714f4121f4738c05a9ed2e (patch) | |
| tree | 8efc1911d1c2d9e0bec6ee8ea4429ab158324338 | |
| parent | 9074738a10ed9108b4fb79272df148e9e9045bcb (diff) | |
| parent | f42a737419e41640af33ee0e2c52e7956c56e72e (diff) | |
| download | forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar.gz forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar.bz2 forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.tar.xz forums-36abb61d39c09ecc00714f4121f4738c05a9ed2e.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v314.php | 32 |
3 files changed, 38 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 3c5d477eb9..cf617952d0 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.2.0-a1-dev" /> - <property name="prevversion" value="3.1.3" /> - <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" /> + <property name="prevversion" value="3.1.4" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 198b75ad57..88df39a6d5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -113,6 +113,10 @@ <a name="v313"></a><h3>Changes since 3.1.3</h3> + <h4>Security</h4> + <ul> + <li>[SECURITY-180] - An insufficient check allowed users of the Google Chrome browser to be redirected to external domains (e.g. on login)</li> + </ul> <h4>Bug</h4> <ul> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8050">PHPBB3-8050</a>] - Avatar & Long PM recipients list break out of template</li> diff --git a/phpBB/phpbb/db/migration/data/v31x/v314.php b/phpBB/phpbb/db/migration/data/v31x/v314.php new file mode 100644 index 0000000000..b7793ca569 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v314.php @@ -0,0 +1,32 @@ +<?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 v314 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v30x\release_3_0_14', + '\phpbb\db\migration\data\v31x\v314rc2', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.4')), + ); + } +} |