Skip to content

Commit 94fde8f

Browse files
marc1706marc1706
committed
Merge branch 'prep-release-3.3.15' into 3.3.x
2 parents 63c110b + 66650cb commit 94fde8f

File tree

8 files changed

+70
-7
lines changed

8 files changed

+70
-7
lines changed

‎build/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
5-
<property name="newversion" value="3.3.15-dev" />
5+
<property name="newversion" value="3.3.15-RC1" />
66
<property name="prevversion" value="3.3.14" />
77
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11, 3.3.12, 3.3.13" />
88
<!-- no configuration should be needed beyond this point -->

‎phpBB/docs/CHANGELOG.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ <h1>Changelog</h1>
5050
<ol>
5151
<li><a href="#changelog">Changelog</a>
5252
<ul>
53+
<li><a href="#v3314">Changes since 3.3.14</a></li>
5354
<li><a href="#v3314rc1">Changes since 3.3.14-RC1</a></li>
5455
<li><a href="#v3313">Changes since 3.3.13</a></li>
5556
<li><a href="#v3313rc1">Changes since 3.3.13-RC1</a></li>
@@ -173,6 +174,32 @@ <h1>Changelog</h1>
173174
<div class="inner">
174175

175176
<div class="content">
177+
<a name="v3314"></a><h3>Changes since 3.3.14</h3>
178+
<h4>Bug</h4>
179+
<ul>
180+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17227">PHPBB-17227</a>] - Member list sorting bug - repeating users on several pages</li>
181+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17381">PHPBB-17381</a>] - 'topic_views' column overflow blocks access to the topic</li>
182+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17417">PHPBB-17417</a>] - Day selection not visible when no results</li>
183+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17422">PHPBB-17422</a>] - Ascending posts pagination</li>
184+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17436">PHPBB-17436</a>] - PHP fatal error while converting from phpBB 2.0 with Attachment MOD</li>
185+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17455">PHPBB-17455</a>] - PHP warning on MySQLi connection failure</li>
186+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17463">PHPBB-17463</a>] - Extra &amp; in unread posts search pagination </li>
187+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17468">PHPBB-17468</a>] - Reset password feature is not restricted to email</li>
188+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17470">PHPBB-17470</a>] - Enable feeds setting not enforced</li>
189+
</ul>
190+
<h4>Improvement</h4>
191+
<ul>
192+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17429">PHPBB-17429</a>] - Adding event before users have been added to a group</li>
193+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17431">PHPBB-17431</a>] - Add more vars to memberlist event</li>
194+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17433">PHPBB-17433</a>] - Unclear instructions in ACP, Server settings</li>
195+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17443">PHPBB-17443</a>] - Various Guzzle client issues for version checks</li>
196+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17446">PHPBB-17446</a>] - Add acp_account_activation_edit_add event</li>
197+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17461">PHPBB-17461</a>] - Add php events for ACP main actions</li>
198+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17467">PHPBB-17467</a>] - Add TLS v.1.3 support to email messenger connection</li>
199+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17471">PHPBB-17471</a>] - Forum feed link in forumlist_body does not return the correct URL</li>
200+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17478">PHPBB-17478</a>] - Add security policy to repository</li>
201+
</ul>
202+
176203
<a name="v3314rc1"></a><h3>Changes since 3.3.14-RC1</h3>
177204
<h4>Improvement</h4>
178205
<ul>

‎phpBB/includes/constants.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929

3030
// phpBB Version
31-
@define('PHPBB_VERSION', '3.3.15-dev');
31+
@define('PHPBB_VERSION', '3.3.15-RC1');
3232

3333
// QA-related
3434
// define('PHPBB_QA', 1);

‎phpBB/install/convertors/convert_phpbb20.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
$convertor_data = array(
3939
'forum_name' => 'phpBB 2.0.x',
4040
'version' => '1.0.3',
41-
'phpbb_version' => '3.3.14',
41+
'phpbb_version' => '3.3.15',
4242
'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>',
4343
'dbms' => $dbms,
4444
'dbhost' => $dbhost,

‎phpBB/install/phpbbcli.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
define('IN_PHPBB', true);
2424
define('IN_INSTALL', true);
2525
define('PHPBB_ENVIRONMENT', 'production');
26-
define('PHPBB_VERSION', '3.3.14');
26+
define('PHPBB_VERSION', '3.3.15-RC1');
2727
$phpbb_root_path = __DIR__ . '/../';
2828
$phpEx = substr(strrchr(__FILE__, '.'), 1);
2929

‎phpBB/install/schemas/schema_data.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock
316316
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
317317
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
318318
INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
319-
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-dev');
319+
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-RC1');
320320
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
321321
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
322322

‎phpBB/phpbb/db/migration/data/v33x/v3315rc1.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
*
4+
* This file is part of the phpBB Forum Software package.
5+
*
6+
* @copyright (c) phpBB Limited <https://www.phpbb.com>
7+
* @license GNU General Public License, version 2 (GPL-2.0)
8+
*
9+
* For full copyright and license information, please see
10+
* the docs/CREDITS.txt file.
11+
*
12+
*/
13+
14+
namespace phpbb\db\migration\data\v33x;
15+
16+
class v3315rc1 extends \phpbb\db\migration\migration
17+
{
18+
public function effectively_installed()
19+
{
20+
return version_compare($this->config['version'], '3.3.15-RC1', '>=');
21+
}
22+
23+
public static function depends_on()
24+
{
25+
return [
26+
'\phpbb\db\migration\data\v33x\topic_views_update',
27+
];
28+
}
29+
30+
public function update_data()
31+
{
32+
return [
33+
['config.update', ['version', '3.3.15-RC1']],
34+
];
35+
}
36+
}

‎phpBB/styles/prosilver/style.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
# General Information about this style
2222
name = prosilver
2323
copyright = © phpBB Limited, 2007
24-
style_version = 3.3.14
25-
phpbb_version = 3.3.14
24+
style_version = 3.3.15
25+
phpbb_version = 3.3.15
2626

2727
# Defining a different template bitfield
2828
# template_bitfield = //g=

0 commit comments

Comments
 (0)