diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:24:03 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:24:03 +0200 |
| commit | 135b76b6432f88e850b0149473af1b46408e4c91 (patch) | |
| tree | 6cdc75ca2f37e6fee6717d4891541980fa2d18e0 /phpBB/search.php | |
| parent | 61c92c07eefdae649ab01ae16051e24f3a208058 (diff) | |
| parent | 1cdff6067640bcd7c0d408ce73f5e4fbb5121526 (diff) | |
| download | forums-135b76b6432f88e850b0149473af1b46408e4c91.tar forums-135b76b6432f88e850b0149473af1b46408e4c91.tar.gz forums-135b76b6432f88e850b0149473af1b46408e4c91.tar.bz2 forums-135b76b6432f88e850b0149473af1b46408e4c91.tar.xz forums-135b76b6432f88e850b0149473af1b46408e4c91.zip | |
Merge pull request #2340 from PayBas/ticket/12431
[ticket/12431] Add has_poll icon to topiclists
* PayBas/ticket/12431:
[ticket/12431] Lang full sentence
[ticket/12431] Add topic poll icon.
[ticket/12431] Add has_poll icon to topiclists
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index a34c0a4e5a..49df0d4da6 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -613,6 +613,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'REPORTED_IMG' => $user->img('icon_topic_reported', 'TOPIC_REPORTED'), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'), 'DELETED_IMG' => $user->img('icon_topic_deleted', 'TOPIC_DELETED'), + 'POLL_IMG' => $user->img('icon_topic_poll', 'TOPIC_POLL'), 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), 'U_SEARCH_WORDS' => $u_search, @@ -973,6 +974,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'S_TOPIC_UNAPPROVED' => $topic_unapproved, 'S_POSTS_UNAPPROVED' => $posts_unapproved, 'S_TOPIC_DELETED' => $topic_deleted, + 'S_HAS_POLL' => ($row['poll_start']) ? true : false, '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']), |