diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 18:44:01 +0200 |
| commit | f42a737419e41640af33ee0e2c52e7956c56e72e (patch) | |
| tree | c58989a51cd189b25a34217b7dd61caaadc19e93 /phpBB | |
| parent | 713fe496ce0d18c321492c27a8e0301f02ddcf52 (diff) | |
| parent | 005c27e73d2cd8b6e60eaf09ebc670ce8693f3b4 (diff) | |
| download | forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.gz forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.bz2 forums-f42a737419e41640af33ee0e2c52e7956c56e72e.tar.xz forums-f42a737419e41640af33ee0e2c52e7956c56e72e.zip | |
Merge branch 'prep-release-3.1.4' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v314.php | 32 |
2 files changed, 36 insertions, 0 deletions
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')), + ); + } +} |