diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f60622b75b..2ca61084bf 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -130,6 +130,7 @@
[Fix] Fixed reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)
[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)
[Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)
+ [Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21 )
[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)
[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 509e11e524..c1bc4b3f31 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1833,7 +1833,7 @@ class user extends session
// Does the user need to change their password? If so, redirect to the
// ucp profile reg_details page ... of course do not redirect if we're already in the ucp
- if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && $this->data['is_registered'] && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400))
+ if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && !empty($this->data['is_registered']) && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400))
{
if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx")
{
diff --git a/phpBB/style.php b/phpBB/style.php
index 78fd2a91b4..a5c50e7fec 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -91,7 +91,7 @@ if ($id)
$recompile = $config['load_tplcompile'];
if (!$user)
{
- $id = $config['default_style'];
+ $id = ($id) ? $id : $config['default_style'];
$recompile = false;
$user = array('user_id' => ANONYMOUS);
}
@@ -289,4 +289,4 @@ if ($id)
exit;
-?>
\ No newline at end of file
+?>