diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:39:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:39:51 +0200 |
| commit | dde72c58b087c390c36ab12ba9e371f9fb0b2dfc (patch) | |
| tree | 9203b70f96092d26be6c0bc8a85c97fbf6e07aca /phpBB | |
| parent | 1ad09d9c8b40310698648e1064f186c2670ad880 (diff) | |
| parent | 11242dd07d6359a725f22f3674028adfdddb49d6 (diff) | |
| download | forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar.gz forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar.bz2 forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.tar.xz forums-dde72c58b087c390c36ab12ba9e371f9fb0b2dfc.zip | |
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
[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
phpBB/includes/constants.php
phpBB/install/database_update.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/v30x/release_3_0_14.php | 37 |
2 files changed, 41 insertions, 0 deletions
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')), + )), + ); + } +} |