diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-01-26 18:57:06 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-01-26 18:57:06 +0100 |
| commit | ebd5aace3fd556d6b588b07329a7eed37997045b (patch) | |
| tree | 9429e387112fa2e701eef6555d860499f3f989f2 /phpBB | |
| parent | 4c11ea97d56e759cb3d1bc047a56f92a060f7124 (diff) | |
| parent | 5ce89ae82f7be38ef539872dc1fd360fb45c906a (diff) | |
| download | forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar.gz forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar.bz2 forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar.xz forums-ebd5aace3fd556d6b588b07329a7eed37997045b.zip | |
Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
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 | 7 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d52a9d3c98..982dd5cf60 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -96,6 +96,11 @@ <a name="v3012"></a><h3>1.i. Changes since 3.0.12</h3> +<h4>Security</h4> +<ul> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13531">PHPBB3-13531</a>] - Disallow trailing paths (e.g. using the PATH_INFO feature) to prevent path-relative CSS injection</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13526">PHPBB3-13526</a>] - Correctly validate ucp_pm_options form key</li> +</ul> <h4>Bug</h4> <ul> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-6703">PHPBB3-6703</a>] - Problem with russian letter while converting from 2.0.x</li> @@ -177,7 +182,6 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13376">PHPBB3-13376</a>] - deregister_globals() does not work correctly when $_COOKIE['GLOBALS'] - is specified</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13519">PHPBB3-13519</a>] - Correctly validate imagick path as path and not string</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13523">PHPBB3-13523</a>] - PHP 5.2 Unit Tests no longer work due to deprecated PHPUnit PEAR channel</li> -<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13526">PHPBB3-13526</a>] - Correctly validate ucp_pm_options form key</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13527">PHPBB3-13527</a>] - Escape information received from version server</li> </ul> <h4>Improvement</h4> @@ -200,7 +204,6 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12247">PHPBB3-12247</a>] - include poster's username in email notifications of posts that get approved by moderators</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12259">PHPBB3-12259</a>] - Too many redundant tests are run on Travis</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12468">PHPBB3-12468</a>] - Allow mbstring.http_input='' besides 'pass' for PHP 5.6 compatibility</li> -<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13531">PHPBB3-13531</a>] - Disallow trailing paths (e.g. using the PATH_INFO feature)</li> </ul> <h4>Task</h4> <ul> diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 8e5b5969ad..5c0ead437d 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1013,6 +1013,8 @@ function database_update_info() '3.0.12-RC3' => array(), // No changes from 3.0.12 to 3.0.13-RC1 '3.0.12' => array(), + // No changes from 3.0.13-RC1 to 3.0.13 + '3.0.13-RC1' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.14-RC1 */ ); @@ -2260,6 +2262,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.12 to 3.0.13-RC1 case '3.0.12': break; + + // No changes from 3.0.13-RC1 to 3.0.13 + case '3.0.13-RC1': + break; } } |