diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:43:32 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:43:32 +0200 |
| commit | cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32 (patch) | |
| tree | 8718af3fab56737b4f50b99250d4665684303d82 | |
| parent | af3cde98f44967a4c9f881f5abfc8b8ea329ea27 (diff) | |
| parent | dde72c58b087c390c36ab12ba9e371f9fb0b2dfc (diff) | |
| download | forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar.gz forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar.bz2 forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.tar.xz forums-cfeb2bec80ac614122d7e7b2a9c3a97d73ecfa32.zip | |
Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/release_3_0_14.php | 37 |
3 files changed, 42 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 823f57206d..ec6827f866 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.1.5-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-RC1, 3.1.0, 3.1.1, 3.1.2" /> + <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" /> <!-- 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 0e6a963f98..198b75ad57 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -2331,6 +2331,10 @@ <a name="v3013-PL1"></a><h3>Changes since 3.0.13-PL1</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-13348">PHPBB3-13348</a>] - sql_freeresult() should be called in feed base class</li> diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_14.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_14.php new file mode 100644 index 0000000000..51475f5a05 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_14.php @@ -0,0 +1,37 @@ +<?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\v30x; + +class release_3_0_14 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.0.14', '>=') && phpbb_version_compare($this->config['version'], '3.1.0-dev', '<'); + } + + static public function depends_on() + { + return array('\phpbb\db\migration\data\v30x\release_3_0_14_rc1'); + } + + public function update_data() + { + return array( + array('if', array( + phpbb_version_compare($this->config['version'], '3.0.14', '<'), + array('config.update', array('version', '3.0.14')), + )), + ); + } +} |