mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.3.9' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander
2022-11-28 20:40:46 +01:00
parent c2968212d8 b3d593b626
commit d03a853f6e
5 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/docs/CHANGELOG.html
View File

@@ -50,6 +50,7 @@
<ol>
<li><a href="#changelog">Changelog</a>
<ul>
<li><a href="#v339rc1">Changes since 3.3.9-RC1</a></li>
<li><a href="#v338">Changes since 3.3.8</a></li>
<li><a href="#v337">Changes since 3.3.7</a></li>
<li><a href="#v336">Changes since 3.3.6</a></li>
@@ -163,6 +164,16 @@
<div class="inner">
<div class="content">
<a name="v339rc1"></a><h3>Changes since 3.3.9-RC1</h3>
<h4>Bug</h4>
<ul>
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17058">PHPBB3-17058</a>] - Special character issue in emails from PHP 8.0 and higher</li>
</ul>
<h4>Hardening</h4>
<ul>
<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-274">SECURITY-274</a>] - Reset login keys/session when resetting password</li>
</ul>
<a name="v338"></a><h3>Changes since 3.3.8</h3>
<h4>Bug</h4>
<ul>

2
phpBB/install/phpbbcli.php
View File

@@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli')
define('IN_PHPBB', true);
define('IN_INSTALL', true);
define('PHPBB_ENVIRONMENT', 'production');
define('PHPBB_VERSION', '3.3.9-RC1');
define('PHPBB_VERSION', '3.3.9');
$phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);

36
phpBB/phpbb/db/migration/data/v33x/v339.php Normal file
View File

@@ -0,0 +1,36 @@
<?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\v33x;
class v339 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.3.9', '>=');
}
public static function depends_on()
{
return [
'\phpbb\db\migration\data\v33x\v339rc1',
];
}
public function update_data()
{
return [
['config.update', ['version', '3.3.9']],
];
}
}

1
phpBB/phpbb/ucp/controller/reset_password.php
View File

@@ -415,6 +415,7 @@ class reset_password
SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
WHERE user_id = ' . (int) $user_row['user_id'];
$this->db->sql_query($sql);
$this->user->reset_login_keys();
$this->log->add('user', $user_row['user_id'], $this->user->ip, 'LOG_USER_NEW_PASSWORD', false, [
'reportee_id' => $user_row['user_id'],
$user_row['username']