5 files changed, 19 insertions, 8 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index e9319dac33..a0fb8ddd54 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2370,7 +2370,16 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 			if (isset($user->lang[$row['log_operation']]))
 			{
 				$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
-				$log[$i]['action'] = str_replace("\n", '<br />', censor_text($log[$i]['action']));
+
+				// If within the admin panel we do not censor text out
+				if (defined('IN_ADMIN'))
+				{
+					$log[$i]['action'] = str_replace("\n", '<br />', $log[$i]['action']);
+				}
+				else
+				{
+					$log[$i]['action'] = str_replace("\n", '<br />', censor_text($log[$i]['action']));
+				}
 			}
 			else
 			{
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 7ce01571f8..1ab6dda638 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -296,8 +296,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				if ($subforum_row['display'] && $subforum_row['name'])
 				{
 					$subforums_list[] = array(
-						'link'	=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $subforum_id),
-						'name'	=> $subforum_row['name']
+						'link'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $subforum_id),
+						'name'		=> $subforum_row['name'],
+						'unread'	=> $forum_unread,
 					);
 				}
 				else
@@ -360,7 +361,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		$s_subforums_list = array();
 		foreach ($subforums_list as $subforum)
 		{
-			$s_subforums_list[] = '<a href="' . $subforum['link'] . '">' . $subforum['name'] . '</a>';
+			$s_subforums_list[] = '<a href="' . $subforum['link'] . '"' . (($subforum['unread']) ? ' class="subforum-unread"' : '') . '>' . $subforum['name'] . '</a>';
 		}
 		$s_subforums_list = (string) implode(', ', $s_subforums_list);
 
@@ -402,7 +403,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		{
 			$template->assign_block_vars('forumrow.subforum', array(
 				'U_SUBFORUM'	=> $subforum['link'],
-				'SUBFORUM_NAME'	=> $subforum['name'])
+				'SUBFORUM_NAME'	=> $subforum['name'],
+				'S_UNREAD'		=> $subforum['unread'])
 			);
 		}
 	}
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index e07c91e8d0..cd14b26169 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -406,7 +406,7 @@ class fileerror extends filespec
 
 /**
 * File upload class
-* Init class (all parameters optional and able to be set/overwritten seperatly) - scope is global and valid for all uploads
+* Init class (all parameters optional and able to be set/overwritten separately) - scope is global and valid for all uploads
 *
 * @package phpBB3
 */
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 454c4fd648..2b845bc4d7 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1409,7 +1409,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'] && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400))
+		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 (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx")
 			{
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index f50c322fce..8c9a9bdccf 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -243,7 +243,7 @@ class ucp_profile
 					'L_USERNAME_EXPLAIN'		=> sprintf($user->lang[$user_char_ary[str_replace('\\\\', '\\', $config['allow_name_chars'])] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']),
 					'L_CHANGE_PASSWORD_EXPLAIN'	=> sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']),
 
-					'S_FORCE_PASSWORD'	=> ($config['chg_passforce'] && $user->data['user_passchg'] < time() - $config['chg_passforce']) ? true : false,
+					'S_FORCE_PASSWORD'	=> ($auth->acl_get('u_chgpasswd') && $config['chg_passforce'] && $user->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) ? true : false,
 					'S_CHANGE_USERNAME' => ($config['allow_namechange'] && $auth->acl_get('u_chgname')) ? true : false,
 					'S_CHANGE_EMAIL'	=> ($auth->acl_get('u_chgemail')) ? true : false,
 					'S_CHANGE_PASSWORD'	=> ($auth->acl_get('u_chgpasswd')) ? true : false)