From d640a379840f923b86cfe937f4870cdb6ebd9279 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Oct 2014 01:48:38 +0200
Subject: [PATCH 1/5] [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6
---
build/build.xml | 2 +-
phpBB/includes/constants.php | 2 +-
phpBB/install/convertors/convert_phpbb20.php | 2 +-
phpBB/install/schemas/schema_data.sql | 2 +-
phpBB/styles/prosilver/style.cfg | 4 ++--
phpBB/styles/subsilver2/style.cfg | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build/build.xml b/build/build.xml
index de0f916a1f..7b11cb9464 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,7 +2,7 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.1.0-RC6-dev" />
+ <property name="newversion" value="3.1.0-RC6" />
<property name="prevversion" value="3.1.0-RC5" />
<property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2, 3.1.0-RC3, 3.1.0-RC4" />
<!-- no configuration should be needed beyond this point -->
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 6693b822fe..4112061695 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-RC6-dev');
+define('PHPBB_VERSION', '3.1.0-RC6');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index cab3fd7f1f..983c11cc98 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.3',
- 'phpbb_version' => '3.1.0-RC5',
+ 'phpbb_version' => '3.1.0-RC6',
'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>',
'dbms' => $dbms,
'dbhost' => $dbhost,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index adbd5a540e..1a2d67ea81 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC6-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC6');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 8853bd4382..90d6bd8e8a 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = prosilver
copyright = © phpBB Limited, 2007
-style_version = 3.1.0-RC5
-phpbb_version = 3.1.0-RC5
+style_version = 3.1.0-RC6
+phpbb_version = 3.1.0-RC6
# Defining a different template bitfield
# template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index b8de165608..0cffcee156 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = subsilver2
copyright = © 2005 phpBB Limited
-style_version = 3.1.0-RC5
-phpbb_version = 3.1.0-RC5
+style_version = 3.1.0-RC6
+phpbb_version = 3.1.0-RC6
# Defining a different template bitfield
# template_bitfield = lNg=
From 4c94e4471071a9ce7489e37cf78f1a6bffb2a55f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Oct 2014 01:50:12 +0200
Subject: [PATCH 2/5] [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6
---
phpBB/phpbb/db/migration/data/v310/rc6.php | 31 ++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 phpBB/phpbb/db/migration/data/v310/rc6.php
diff --git a/phpBB/phpbb/db/migration/data/v310/rc6.php b/phpBB/phpbb/db/migration/data/v310/rc6.php
new file mode 100644
index 0000000000..b84f2edcc9
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/rc6.php
@@ -0,0 +1,31 @@
+<?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\v310;
+
+class rc6 extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v310\rc5',
+ );
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.update', array('version', '3.1.0-RC6')),
+ );
+ }
+}
From 1ade9b39e4451a67ea52fb62c36f23e412e98390 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Oct 2014 01:55:48 +0200
Subject: [PATCH 3/5] [prep-release-3.1.0-RC6] Prepare Changelog
---
phpBB/docs/CHANGELOG.html | 69 ++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 33 deletions(-)
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 3f6bd0ee51..6534fb2e33 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -46,6 +46,7 @@
<ol>
<li><a href="#changelog">Changelog</a>
<ol style="list-style-type: lower-roman;">
+ <li><a href="#v310RC5">Changes since 3.1.0-RC5</a></li>
<li><a href="#v310RC4">Changes since 3.1.0-RC4</a></li>
<li><a href="#v310RC3">Changes since 3.1.0-RC3</a></li>
<li><a href="#v310RC2">Changes since 3.1.0-RC2</a></li>
@@ -98,7 +99,9 @@
<div class="content">
- <a name="v310RC4"></a><h3>1.i. Changes since 3.1.0-RC4</h3>
+ <a name="v310RC5"></a><h3>1.i. Changes since 3.1.0-RC5</h3>
+
+ <a name="v310RC4"></a><h3>1.ii. Changes since 3.1.0-RC4</h3>
<h4>Bug</h4>
<ul>
@@ -165,7 +168,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13123">PHPBB3-13123</a>] - Add events to allow post blocking and post pre/past processing</li>
</ul>
- <a name="v310RC3"></a><h3>1.ii. Changes since 3.1.0-RC3</h3>
+ <a name="v310RC3"></a><h3>1.iii. Changes since 3.1.0-RC3</h3>
<h4>Bug</h4>
<ul>
@@ -255,7 +258,7 @@
</ul>
- <a name="v310RC2"></a><h3>1.iii. Changes since 3.1.0-RC2</h3>
+ <a name="v310RC2"></a><h3>1.iv. Changes since 3.1.0-RC2</h3>
<h4>Bug</h4>
<ul>
@@ -379,7 +382,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12948">PHPBB3-12948</a>] - Remove Travis CI "broken opcache on PHP 5.5.7 and 5.5.8" workaround.</li>
</ul>
- <a name="v310RC1"></a><h3>1.iv. Changes since 3.1.0-RC1</h3>
+ <a name="v310RC1"></a><h3>1.v. Changes since 3.1.0-RC1</h3>
<h4>Bug</h4>
<ul>
@@ -450,7 +453,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12829">PHPBB3-12829</a>] - Remove check for pgsql 8.3/8.2</li>
</ul>
- <a name="v310b4"></a><h3>1.v. Changes since 3.1.0-b4</h3>
+ <a name="v310b4"></a><h3>1.vi. Changes since 3.1.0-b4</h3>
<h4>Bug</h4>
<ul>
@@ -570,7 +573,7 @@
</ul>
- <a name="v310b3"></a><h3>1.vi. Changes since 3.1.0-b3</h3>
+ <a name="v310b3"></a><h3>1.vii. Changes since 3.1.0-b3</h3>
<h4>Bug</h4>
<ul>
@@ -677,7 +680,7 @@
</ul>
- <a name="v310b2"></a><h3>1.vii. Changes since 3.1.0-b2</h3>
+ <a name="v310b2"></a><h3>1.viii. Changes since 3.1.0-b2</h3>
<h4>Bug</h4>
<ul>
@@ -842,7 +845,7 @@
</ul>
- <a name="v310b1"></a><h3>1.viii. Changes since 3.1.0-b1</h3>
+ <a name="v310b1"></a><h3>1.ix. Changes since 3.1.0-b1</h3>
<h4>Bug</h4>
<ul>
@@ -910,7 +913,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12302">PHPBB3-12302</a>] - Upgrade composer.phar to 1.0.0-alpha8</li>
</ul>
- <a name="v310a3"></a><h3>1.ix. Changes since 3.1.0-a3</h3>
+ <a name="v310a3"></a><h3>1.x. Changes since 3.1.0-a3</h3>
<h4>Bug</h4>
<ul>
@@ -1057,7 +1060,7 @@
</ul>
- <a name="v310a2"></a><h3>1.x. Changes since 3.1.0-a2</h3>
+ <a name="v310a2"></a><h3>1.xi. Changes since 3.1.0-a2</h3>
<h4>Bug</h4>
<ul>
@@ -1165,7 +1168,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12147">PHPBB3-12147</a>] - Remove Travis CI notification configuration</li>
</ul>
- <a name="v310a1"></a><h3>1.xi. Changes since 3.1.0-a1</h3>
+ <a name="v310a1"></a><h3>1.xii. Changes since 3.1.0-a1</h3>
<h4>Bug</h4>
<ul>
@@ -1241,7 +1244,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11998">PHPBB3-11998</a>] - Add console / command line client environment </li>
</ul>
- <a name="v30x"></a><h3>1.xii. Changes since 3.0.x</h3>
+ <a name="v30x"></a><h3>1.xiii. Changes since 3.0.x</h3>
<h4>Bug</h4>
<ul>
@@ -1922,7 +1925,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11913">PHPBB3-11913</a>] - Apply reorganisation of download.phpbb.com to build_announcement.php</li>
</ul>
- <a name="v3011"></a><h3>1.xiii. Changes since 3.0.11</h3>
+ <a name="v3011"></a><h3>1.xiv. Changes since 3.0.11</h3>
<h4>Bug</h4>
<ul>
@@ -2077,7 +2080,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11753">PHPBB3-11753</a>] - Upgrade mysql_upgrader.php schema data.</li>
</ul>
- <a name="v3010"></a><h3>1.xiv. Changes since 3.0.10</h3>
+ <a name="v3010"></a><h3>1.xv. Changes since 3.0.10</h3>
<h4>Bug</h4>
<ul>
@@ -2202,7 +2205,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10909">PHPBB3-10909</a>] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2</li>
</ul>
- <a name="v309"></a><h3>1.xv. Changes since 3.0.9</h3>
+ <a name="v309"></a><h3>1.xvi. Changes since 3.0.9</h3>
<h4>Bug</h4>
<ul>
@@ -2338,7 +2341,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10480">PHPBB3-10480</a>] - Automate changelog building</li>
</ul>
- <a name="v308"></a><h3>1.xvi. Changes since 3.0.8</h3>
+ <a name="v308"></a><h3>1.xvii. Changes since 3.0.8</h3>
<h4> Bug
</h4>
@@ -2706,7 +2709,7 @@
</ul>
- <a name="v307-PL1"></a><h3>1.xvii. Changes since 3.0.7-PL1</h3>
+ <a name="v307-PL1"></a><h3>1.xviii. Changes since 3.0.7-PL1</h3>
<h4> Security
</h4>
<ul>
@@ -3164,13 +3167,13 @@
</ul>
- <a name="v307"></a><h3>1.xviii. Changes since 3.0.7</h3>
+ <a name="v307"></a><h3>1.xix. Changes since 3.0.7</h3>
<ul>
<li>[Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)</li>
</ul>
- <a name="v306"></a><h3>1.xix. Changes since 3.0.6</h3>
+ <a name="v306"></a><h3>1.xx. Changes since 3.0.6</h3>
<ul>
<li>[Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)</li>
@@ -3274,7 +3277,7 @@
</ul>
- <a name="v305"></a><h3>1.xx. Changes since 3.0.5</h3>
+ <a name="v305"></a><h3>1.xxi. Changes since 3.0.5</h3>
<ul>
<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
@@ -3496,7 +3499,7 @@
<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
</ul>
- <a name="v304"></a><h3>1.xxi. Changes since 3.0.4</h3>
+ <a name="v304"></a><h3>1.xxii. Changes since 3.0.4</h3>
<ul>
<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
@@ -3585,7 +3588,7 @@
<li>[Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)</li>
</ul>
- <a name="v303"></a><h3>1.xxii. Changes since 3.0.3</h3>
+ <a name="v303"></a><h3>1.xxiii. Changes since 3.0.3</h3>
<ul>
<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
@@ -3617,7 +3620,7 @@
<li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li>
</ul>
- <a name="v302"></a><h3>1.xxiii. Changes since 3.0.2</h3>
+ <a name="v302"></a><h3>1.xxiv. Changes since 3.0.2</h3>
<ul>
<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
@@ -3716,7 +3719,7 @@
<li>[Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)</li>
</ul>
- <a name="v301"></a><h3>1.xxiv. Changes since 3.0.1</h3>
+ <a name="v301"></a><h3>1.xxv. Changes since 3.0.1</h3>
<ul>
<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
@@ -3764,7 +3767,7 @@
<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
</ul>
- <a name="v300"></a><h3>1.xxv. Changes since 3.0.0</h3>
+ <a name="v300"></a><h3>1.xxvi. Changes since 3.0.0</h3>
<ul>
<li>[Change] Validate birthdays (Bug #15004)</li>
@@ -3835,7 +3838,7 @@
<li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li>
</ul>
- <a name="v30rc8"></a><h3>1.xxvi. Changes since 3.0.RC8</h3>
+ <a name="v30rc8"></a><h3>1.xxvii. Changes since 3.0.RC8</h3>
<ul>
<li>[Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)</li>
@@ -3844,7 +3847,7 @@
<li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li>
</ul>
- <a name="v30rc7"></a><h3>1.xxvii. Changes since 3.0.RC7</h3>
+ <a name="v30rc7"></a><h3>1.xxviii. Changes since 3.0.RC7</h3>
<ul>
<li>[Fix] Fixed MSSQL related bug in the update system</li>
@@ -3879,7 +3882,7 @@
<li>[Fix] No duplication of active topics (Bug #15474)</li>
</ul>
- <a name="v30rc6"></a><h3>1.xxviii. Changes since 3.0.RC6</h3>
+ <a name="v30rc6"></a><h3>1.xxix. Changes since 3.0.RC6</h3>
<ul>
<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
@@ -3889,7 +3892,7 @@
<li>[Fix] Able to request new password (Bug #14743)</li>
</ul>
- <a name="v30rc5"></a><h3>1.xxix. Changes since 3.0.RC5</h3>
+ <a name="v30rc5"></a><h3>1.xxx. Changes since 3.0.RC5</h3>
<ul>
<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
@@ -3952,7 +3955,7 @@
<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
</ul>
- <a name="v30rc4"></a><h3>1.xxx. Changes since 3.0.RC4</h3>
+ <a name="v30rc4"></a><h3>1.xxxi. Changes since 3.0.RC4</h3>
<ul>
<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -4003,7 +4006,7 @@
<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
</ul>
- <a name="v30rc3"></a><h3>1.xxxi. Changes since 3.0.RC3</h3>
+ <a name="v30rc3"></a><h3>1.xxxii. Changes since 3.0.RC3</h3>
<ul>
<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -4112,7 +4115,7 @@
</ul>
- <a name="v30rc2"></a><h3>1.xxxii. Changes since 3.0.RC2</h3>
+ <a name="v30rc2"></a><h3>1.xxxiii. Changes since 3.0.RC2</h3>
<ul>
<li>[Fix] Re-allow searching within the memberlist</li>
@@ -4158,7 +4161,7 @@
</ul>
- <a name="v30rc1"></a><h3>1.xxxiii. Changes since 3.0.RC1</h3>
+ <a name="v30rc1"></a><h3>1.xxxiv. Changes since 3.0.RC1</h3>
<ul>
<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
From 5847a50334367b693d09ce2105ab49b3283bb934 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Oct 2014 01:57:59 +0200
Subject: [PATCH 4/5] [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6
---
phpBB/docs/CHANGELOG.html | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 6534fb2e33..559338f521 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -101,6 +101,41 @@
<a name="v310RC5"></a><h3>1.i. Changes since 3.1.0-RC5</h3>
+ <h4>Bug</h4>
+ <ul>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12530">PHPBB3-12530</a>] - Visual confirmation is breaking layout in prosilver's mobile mode</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12568">PHPBB3-12568</a>] - docs/README.html references MODs instead of extensions</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13124">PHPBB3-13124</a>] - PHP event extractor too strict on doc blocks</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13138">PHPBB3-13138</a>] - Banned users cause infinite recursion</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13140">PHPBB3-13140</a>] - Header links don't re-appear on window size increase</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13161">PHPBB3-13161</a>] - PHP Warnings issued from phpbb database test case</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13163">PHPBB3-13163</a>] - Header Navbar Responsiveness Broken</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13164">PHPBB3-13164</a>] - Data sent to core.submit_post_end event does not include fresh post_visibility</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13168">PHPBB3-13168</a>] - Warning displayed in PHP 5.6 for mbstring.http_input</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13169">PHPBB3-13169</a>] - Responsive forms not displaying correctly in RTL</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13171">PHPBB3-13171</a>] - Can not delete posts and soft delete topics in MCP topic view</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13174">PHPBB3-13174</a>] - Minor HTML error in ucp_pm_viewmessage.html (needs closing </div>)</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13177">PHPBB3-13177</a>] - Post count-based ranks do not display in viewtopic</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13181">PHPBB3-13181</a>] - Sphinx config template should use place holders for database credentials</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13186">PHPBB3-13186</a>] - Do not link post count to author search if search disabled</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13187">PHPBB3-13187</a>] - INSTALL.html is not valid HTML</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13188">PHPBB3-13188</a>] - Sphinx index() function triggers slow queries that time out replies</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13190">PHPBB3-13190</a>] - phpbb_session_login_keys_test::test_reset_keys fails on develop-ascraeus</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13194">PHPBB3-13194</a>] - BBCode isn't parsed when issuing a warning for a post</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13203">PHPBB3-13203</a>] - Use constant time comparison method for comparing password hashes</li>
+ </ul>
+ <h4>Improvement</h4>
+ <ul>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12796">PHPBB3-12796</a>] - View own Profile should have an edit button</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12799">PHPBB3-12799</a>] - Place the events for f_brunoais_read_other</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13041">PHPBB3-13041</a>] - help_faq.php language file needs to be revised</li>
+ </ul>
+ <h4>New Feature</h4>
+ <ul>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13205">PHPBB3-13205</a>] - Add mark all PMs read button</li>
+ </ul>
+
+
<a name="v310RC4"></a><h3>1.ii. Changes since 3.1.0-RC4</h3>
<h4>Bug</h4>
From 7a90184421a5c70f657a7497abade036054ee5dd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Oct 2014 02:44:18 +0200
Subject: [PATCH 5/5] [prep-release-3.1.0-RC6] Update phpBB Version for RC7
development
---
build/build.xml | 6 +++---
phpBB/includes/constants.php | 2 +-
phpBB/install/schemas/schema_data.sql | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build/build.xml b/build/build.xml
index 7b11cb9464..3797ab6bf0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.1.0-RC6" />
- <property name="prevversion" value="3.1.0-RC5" />
- <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2, 3.1.0-RC3, 3.1.0-RC4" />
+ <property name="newversion" value="3.1.0-RC7-dev" />
+ <property name="prevversion" value="3.1.0-RC6" />
+ <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2, 3.1.0-RC3, 3.1.0-RC4, 3.1.0-RC5" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 4112061695..b4bb2722c3 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-RC6');
+define('PHPBB_VERSION', '3.1.0-RC7-dev');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 1a2d67ea81..f40b1a4d44 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC6');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC7-dev');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');