aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/build.xml2
-rwxr-xr-xbuild/build_changelog.php2
-rw-r--r--phpBB/docs/CHANGELOG.html71
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
-rw-r--r--phpBB/phpbb/cron/task/core/queue.php2
-rw-r--r--phpBB/styles/prosilver/style.cfg4
-rw-r--r--phpBB/styles/subsilver2/style.cfg4
9 files changed, 47 insertions, 44 deletions
diff --git a/build/build.xml b/build/build.xml
index 3797ab6bf0..69ea508a14 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-RC7-dev" />
+ <property name="newversion" value="3.1.0" />
<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 -->
diff --git a/build/build_changelog.php b/build/build_changelog.php
index be0fb625ea..2d38480f9f 100755
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -20,7 +20,7 @@ if ($_SERVER['argc'] != 2)
$fixVersion = $_SERVER['argv'][1];
-$query = 'project = PHPBB3
+$query = 'project IN (PHPBB3, SECURITY)
AND resolution = Fixed
AND fixVersion = "' . $fixVersion . '"
AND status IN ("Unverified Fix", Closed)';
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 559338f521..bff54b091a 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="#v310RC6">Changes since 3.1.0-RC6</a></li>
<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>
@@ -99,7 +100,9 @@
<div class="content">
- <a name="v310RC5"></a><h3>1.i. Changes since 3.1.0-RC5</h3>
+ <a name="v310RC6"></a><h3>1.i. Changes since 3.1.0-RC6</h3>
+
+ <a name="v310RC5"></a><h3>1.ii. Changes since 3.1.0-RC5</h3>
<h4>Bug</h4>
<ul>
@@ -136,7 +139,7 @@
</ul>
- <a name="v310RC4"></a><h3>1.ii. Changes since 3.1.0-RC4</h3>
+ <a name="v310RC4"></a><h3>1.iii. Changes since 3.1.0-RC4</h3>
<h4>Bug</h4>
<ul>
@@ -203,7 +206,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.iii. Changes since 3.1.0-RC3</h3>
+ <a name="v310RC3"></a><h3>1.iv. Changes since 3.1.0-RC3</h3>
<h4>Bug</h4>
<ul>
@@ -293,7 +296,7 @@
</ul>
- <a name="v310RC2"></a><h3>1.iv. Changes since 3.1.0-RC2</h3>
+ <a name="v310RC2"></a><h3>1.v. Changes since 3.1.0-RC2</h3>
<h4>Bug</h4>
<ul>
@@ -417,7 +420,7 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12948">PHPBB3-12948</a>] - Remove Travis CI &quot;broken opcache on PHP 5.5.7 and 5.5.8&quot; workaround.</li>
</ul>
- <a name="v310RC1"></a><h3>1.v. Changes since 3.1.0-RC1</h3>
+ <a name="v310RC1"></a><h3>1.vi. Changes since 3.1.0-RC1</h3>
<h4>Bug</h4>
<ul>
@@ -488,7 +491,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.vi. Changes since 3.1.0-b4</h3>
+ <a name="v310b4"></a><h3>1.vii. Changes since 3.1.0-b4</h3>
<h4>Bug</h4>
<ul>
@@ -608,7 +611,7 @@
</ul>
- <a name="v310b3"></a><h3>1.vii. Changes since 3.1.0-b3</h3>
+ <a name="v310b3"></a><h3>1.viii. Changes since 3.1.0-b3</h3>
<h4>Bug</h4>
<ul>
@@ -715,7 +718,7 @@
</ul>
- <a name="v310b2"></a><h3>1.viii. Changes since 3.1.0-b2</h3>
+ <a name="v310b2"></a><h3>1.ix. Changes since 3.1.0-b2</h3>
<h4>Bug</h4>
<ul>
@@ -880,7 +883,7 @@
</ul>
- <a name="v310b1"></a><h3>1.ix. Changes since 3.1.0-b1</h3>
+ <a name="v310b1"></a><h3>1.x. Changes since 3.1.0-b1</h3>
<h4>Bug</h4>
<ul>
@@ -948,7 +951,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.x. Changes since 3.1.0-a3</h3>
+ <a name="v310a3"></a><h3>1.xi. Changes since 3.1.0-a3</h3>
<h4>Bug</h4>
<ul>
@@ -1095,7 +1098,7 @@
</ul>
- <a name="v310a2"></a><h3>1.xi. Changes since 3.1.0-a2</h3>
+ <a name="v310a2"></a><h3>1.xii. Changes since 3.1.0-a2</h3>
<h4>Bug</h4>
<ul>
@@ -1203,7 +1206,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.xii. Changes since 3.1.0-a1</h3>
+ <a name="v310a1"></a><h3>1.xiii. Changes since 3.1.0-a1</h3>
<h4>Bug</h4>
<ul>
@@ -1279,7 +1282,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.xiii. Changes since 3.0.x</h3>
+ <a name="v30x"></a><h3>1.xiv. Changes since 3.0.x</h3>
<h4>Bug</h4>
<ul>
@@ -1960,7 +1963,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.xiv. Changes since 3.0.11</h3>
+ <a name="v3011"></a><h3>1.xv. Changes since 3.0.11</h3>
<h4>Bug</h4>
<ul>
@@ -2115,7 +2118,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.xv. Changes since 3.0.10</h3>
+ <a name="v3010"></a><h3>1.xvi. Changes since 3.0.10</h3>
<h4>Bug</h4>
<ul>
@@ -2240,7 +2243,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.xvi. Changes since 3.0.9</h3>
+ <a name="v309"></a><h3>1.xvii. Changes since 3.0.9</h3>
<h4>Bug</h4>
<ul>
@@ -2376,7 +2379,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.xvii. Changes since 3.0.8</h3>
+ <a name="v308"></a><h3>1.xviii. Changes since 3.0.8</h3>
<h4> Bug
</h4>
@@ -2744,7 +2747,7 @@
</ul>
- <a name="v307-PL1"></a><h3>1.xviii. Changes since 3.0.7-PL1</h3>
+ <a name="v307-PL1"></a><h3>1.xix. Changes since 3.0.7-PL1</h3>
<h4> Security
</h4>
<ul>
@@ -3202,13 +3205,13 @@
</ul>
- <a name="v307"></a><h3>1.xix. Changes since 3.0.7</h3>
+ <a name="v307"></a><h3>1.xx. 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.xx. Changes since 3.0.6</h3>
+ <a name="v306"></a><h3>1.xxi. 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>
@@ -3312,7 +3315,7 @@
</ul>
- <a name="v305"></a><h3>1.xxi. Changes since 3.0.5</h3>
+ <a name="v305"></a><h3>1.xxii. Changes since 3.0.5</h3>
<ul>
<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
@@ -3534,7 +3537,7 @@
<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
</ul>
- <a name="v304"></a><h3>1.xxii. Changes since 3.0.4</h3>
+ <a name="v304"></a><h3>1.xxiii. 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>
@@ -3623,7 +3626,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.xxiii. Changes since 3.0.3</h3>
+ <a name="v303"></a><h3>1.xxiv. Changes since 3.0.3</h3>
<ul>
<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
@@ -3655,7 +3658,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.xxiv. Changes since 3.0.2</h3>
+ <a name="v302"></a><h3>1.xxv. 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>
@@ -3754,7 +3757,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.xxv. Changes since 3.0.1</h3>
+ <a name="v301"></a><h3>1.xxvi. Changes since 3.0.1</h3>
<ul>
<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
@@ -3802,7 +3805,7 @@
<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
</ul>
- <a name="v300"></a><h3>1.xxvi. Changes since 3.0.0</h3>
+ <a name="v300"></a><h3>1.xxvii. Changes since 3.0.0</h3>
<ul>
<li>[Change] Validate birthdays (Bug #15004)</li>
@@ -3873,7 +3876,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.xxvii. Changes since 3.0.RC8</h3>
+ <a name="v30rc8"></a><h3>1.xxviii. Changes since 3.0.RC8</h3>
<ul>
<li>[Fix] Cleaned usernames contain only single spaces, so &quot;a_name&quot; and &quot;a__name&quot; are treated as the same name (Bug #15634)</li>
@@ -3882,7 +3885,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.xxviii. Changes since 3.0.RC7</h3>
+ <a name="v30rc7"></a><h3>1.xxix. Changes since 3.0.RC7</h3>
<ul>
<li>[Fix] Fixed MSSQL related bug in the update system</li>
@@ -3917,7 +3920,7 @@
<li>[Fix] No duplication of active topics (Bug #15474)</li>
</ul>
- <a name="v30rc6"></a><h3>1.xxix. Changes since 3.0.RC6</h3>
+ <a name="v30rc6"></a><h3>1.xxx. Changes since 3.0.RC6</h3>
<ul>
<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
@@ -3927,7 +3930,7 @@
<li>[Fix] Able to request new password (Bug #14743)</li>
</ul>
- <a name="v30rc5"></a><h3>1.xxx. Changes since 3.0.RC5</h3>
+ <a name="v30rc5"></a><h3>1.xxxi. 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>
@@ -3990,7 +3993,7 @@
<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
</ul>
- <a name="v30rc4"></a><h3>1.xxxi. Changes since 3.0.RC4</h3>
+ <a name="v30rc4"></a><h3>1.xxxii. Changes since 3.0.RC4</h3>
<ul>
<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -4041,7 +4044,7 @@
<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
</ul>
- <a name="v30rc3"></a><h3>1.xxxii. Changes since 3.0.RC3</h3>
+ <a name="v30rc3"></a><h3>1.xxxiii. Changes since 3.0.RC3</h3>
<ul>
<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -4150,7 +4153,7 @@
</ul>
- <a name="v30rc2"></a><h3>1.xxxiii. Changes since 3.0.RC2</h3>
+ <a name="v30rc2"></a><h3>1.xxxiv. Changes since 3.0.RC2</h3>
<ul>
<li>[Fix] Re-allow searching within the memberlist</li>
@@ -4196,7 +4199,7 @@
</ul>
- <a name="v30rc1"></a><h3>1.xxxiv. Changes since 3.0.RC1</h3>
+ <a name="v30rc1"></a><h3>1.xxxv. Changes since 3.0.RC1</h3>
<ul>
<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index b4bb2722c3..76c3834c91 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-RC7-dev');
+define('PHPBB_VERSION', '3.1.0');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 983c11cc98..8f6af30426 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-RC6',
+ 'phpbb_version' => '3.1.0',
'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 f40b1a4d44..bc4a9f7fe1 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-RC7-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0');
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/phpbb/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php
index 796a96d7f5..a9345a44df 100644
--- a/phpBB/phpbb/cron/task/core/queue.php
+++ b/phpBB/phpbb/cron/task/core/queue.php
@@ -73,6 +73,6 @@ class queue extends \phpbb\cron\task\base
*/
public function should_run()
{
- return $this->config['last_queue_run'] < time() - $this->config['queue_interval_config'];
+ return $this->config['last_queue_run'] < time() - $this->config['queue_interval'];
}
}
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 90d6bd8e8a..de7b38c90b 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-RC6
-phpbb_version = 3.1.0-RC6
+style_version = 3.1.0
+phpbb_version = 3.1.0
# Defining a different template bitfield
# template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 0cffcee156..685e876cc7 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-RC6
-phpbb_version = 3.1.0-RC6
+style_version = 3.1.0
+phpbb_version = 3.1.0
# Defining a different template bitfield
# template_bitfield = lNg=