diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-05 00:37:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-05 00:37:40 +0200 |
| commit | fcb94766150aafd5db692c47cdccc7a97950b7d4 (patch) | |
| tree | 47852ed4ce11397f483b073ea2259803c3922ba0 /phpBB | |
| parent | f446afa06b3642a24a548699b69c5b7bc4a35edb (diff) | |
| parent | 50818a342bf60eba038b47af36f7ff32d3f7867a (diff) | |
| download | forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar.gz forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar.bz2 forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar.xz forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
Conflicts:
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 | 3 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f2d5ddc212..26f1d6ff94 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -192,6 +192,9 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11674">PHPBB3-11674</a>] - Do not include vendor folder if there are no dependencies.</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11524">PHPBB3-11524</a>] - MySQL Upgrader throws warnings on PHP 5.4</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11720">PHPBB3-11720</a>] - Reporting posts leads to white page error</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11769">PHPBB3-11769</a>] - Wrong poster in subscription email when poster is using the Quote button</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11775">PHPBB3-11775</a>] - Error while moving posts to a new topic</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11802">PHPBB3-11802</a>] - Undefined variable $browser in /download/file.php</li> </ul> <h4>Improvement</h4> <ul> diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6aca38d297..1070b10b18 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1007,6 +1007,8 @@ function database_update_info() '3.0.11' => array(), // No changes from 3.0.12-RC1 to 3.0.12-RC2 '3.0.12-RC1' => array(), + // No changes from 3.0.12-RC2 to 3.0.12-RC3 + '3.0.12-RC2' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.13-RC1 */ ); @@ -2242,6 +2244,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.12-RC1 to 3.0.12-RC2 case '3.0.12-RC1': break; + + // No changes from 3.0.12-RC2 to 3.0.12-RC3 + case '3.0.12-RC2': + break; } } |