mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/16237] Fix broken vars and remove conditional overhead

Browse Source 
PHPBB3-16237
This commit is contained in:
Matt Friedman
2020-08-21 15:33:08 -07:00
parent 49dd2791e4
commit 9b9ca25934
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/search.php
View File

@@ -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']),