1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

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

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

View File

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