diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index d6a3c43c89..3c9647d3c8 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -276,11 +276,11 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row_ary['icon_id']])) ? $icons[$row_ary['icon_id']]['height'] : '',
'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
'DELETED_IMG' => ($topic_deleted) ? $user->img('icon_topic_deleted', 'TOPIC_DELETED') : '',
- 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false,
- 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false,
- 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false,
- 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false,
- 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false,
+ 'S_POST_ANNOUNCE' => $row_ary['topic_type'] == POST_ANNOUNCE,
+ 'S_POST_GLOBAL' => $row_ary['topic_type'] == POST_GLOBAL,
+ 'S_POST_STICKY' => $row_ary['topic_type'] == POST_STICKY,
+ 'S_TOPIC_LOCKED' => $row_ary['topic_status'] == ITEM_LOCKED,
+ 'S_TOPIC_MOVED' => $row_ary['topic_status'] == ITEM_MOVED,
'TOPIC_AUTHOR' => get_username_string('username', $row_ary['topic_poster'], $row_ary['topic_first_poster_name'], $row_ary['topic_first_poster_colour']),
'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row_ary['topic_poster'], $row_ary['topic_first_poster_name'], $row_ary['topic_first_poster_colour']),
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index a258f51431..9c653fd466 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -962,7 +962,7 @@ class ucp_main
'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
- 'S_DELETED_TOPIC' => (!$row['topic_id']) ? true : false,
+ 'S_DELETED_TOPIC' => !$row['topic_id'],
'REPLIES' => $replies,
'VIEWS' => $row['topic_views'],
@@ -977,14 +977,14 @@ class ucp_main
'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
- 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false,
- 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false,
- 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false,
- 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false,
- 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false,
+ 'S_POST_ANNOUNCE' => $row['topic_type'] == POST_ANNOUNCE,
+ 'S_POST_GLOBAL' => $row['topic_type'] == POST_GLOBAL,
+ 'S_POST_STICKY' => $row['topic_type'] == POST_STICKY,
+ 'S_TOPIC_LOCKED' => $row['topic_status'] == ITEM_LOCKED,
+ 'S_TOPIC_MOVED' => $row['topic_status'] == ITEM_MOVED,
'S_TOPIC_TYPE' => $row['topic_type'],
- 'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false,
+ 'S_USER_POSTED' => !empty($row['topic_posted']),
'S_UNREAD_TOPIC' => $unread_topic,
'U_NEWEST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&view=unread') . '#unread',
diff --git a/phpBB/search.php b/phpBB/search.php
index b2a8aa2c3a..c0f91abb91 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1122,11 +1122,11 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'TOPIC_IMG_STYLE' => $folder_img,
'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
'TOPIC_FOLDER_IMG_ALT' => $user->lang[$folder_alt],
- 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false,
- 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false,
- 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false,
- 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false,
- 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false,
+ 'S_POST_ANNOUNCE' => $row['topic_type'] == POST_ANNOUNCE,
+ 'S_POST_GLOBAL' => $row['topic_type'] == POST_GLOBAL,
+ 'S_POST_STICKY' => $row['topic_type'] == POST_STICKY,
+ 'S_TOPIC_LOCKED' => $row['topic_status'] == ITEM_LOCKED,
+ 'S_TOPIC_MOVED' => $row['topic_status'] == ITEM_MOVED,
'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
@@ -1135,14 +1135,14 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
'S_TOPIC_TYPE' => $row['topic_type'],
- 'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false,
+ 'S_USER_POSTED' => !empty($row['topic_posted']),
'S_UNREAD_TOPIC' => $unread_topic,
- 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $forum_id)) ? true : false,
+ 'S_TOPIC_REPORTED' => !empty($row['topic_reported']) && $auth->acl_get('m_report', $forum_id),
'S_TOPIC_UNAPPROVED' => $topic_unapproved,
'S_POSTS_UNAPPROVED' => $posts_unapproved,
'S_TOPIC_DELETED' => $topic_deleted,
- 'S_HAS_POLL' => ($row['poll_start']) ? true : false,
+ 'S_HAS_POLL' => (bool) $row['poll_start'],
'U_LAST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 02be3054b1..1d6599f58b 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -985,19 +985,19 @@ if (count($topic_list))
'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
'S_TOPIC_TYPE' => $row['topic_type'],
- 'S_USER_POSTED' => (isset($row['topic_posted']) && $row['topic_posted']) ? true : false,
+ 'S_USER_POSTED' => isset($row['topic_posted']) && $row['topic_posted'],
'S_UNREAD_TOPIC' => $unread_topic,
- 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $row['forum_id'])) ? true : false,
+ 'S_TOPIC_REPORTED' => !empty($row['topic_reported']) && $auth->acl_get('m_report', $row['forum_id']),
'S_TOPIC_UNAPPROVED' => $topic_unapproved,
'S_POSTS_UNAPPROVED' => $posts_unapproved,
'S_TOPIC_DELETED' => $topic_deleted,
- 'S_HAS_POLL' => ($row['poll_start']) ? true : false,
- 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false,
- 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false,
- 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false,
- 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false,
- 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false,
- 'S_TOPIC_HOT' => ($config['hot_threshold'] && ($replies + 1) >= $config['hot_threshold'] && $row['topic_status'] != ITEM_LOCKED) ? true : false,
+ 'S_HAS_POLL' => (bool) $row['poll_start'],
+ 'S_POST_ANNOUNCE' => $row['topic_type'] == POST_ANNOUNCE,
+ 'S_POST_GLOBAL' => $row['topic_type'] == POST_GLOBAL,
+ 'S_POST_STICKY' => $row['topic_type'] == POST_STICKY,
+ 'S_TOPIC_LOCKED' => $row['topic_status'] == ITEM_LOCKED,
+ 'S_TOPIC_MOVED' => $row['topic_status'] == ITEM_MOVED,
+ 'S_TOPIC_HOT' => $config['hot_threshold'] && ($replies + 1) >= $config['hot_threshold'] && $row['topic_status'] != ITEM_LOCKED,
'U_NEWEST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&view=unread') . '#unread' : false,
'U_LAST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false,