diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-09 11:00:09 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-09 11:00:09 +0200 |
| commit | b04b5dea36036f4b184a91c064b4e656b435ca08 (patch) | |
| tree | 36f68be88527621f47f74144dc85287ad8c6c59c | |
| parent | a0dafbfb5fcb94c947ed55a737e5e5189999a2d5 (diff) | |
| parent | 053a6d1d704c5d0a2669c685e9cb0406248f6fae (diff) | |
| download | forums-b04b5dea36036f4b184a91c064b4e656b435ca08.tar forums-b04b5dea36036f4b184a91c064b4e656b435ca08.tar.gz forums-b04b5dea36036f4b184a91c064b4e656b435ca08.tar.bz2 forums-b04b5dea36036f4b184a91c064b4e656b435ca08.tar.xz forums-b04b5dea36036f4b184a91c064b4e656b435ca08.zip | |
Merge pull request #3869 from Zoddo/ticket/8800
[ticket/8800] Add "mark topics read" link to "View unread posts"
* Zoddo/ticket/8800:
[ticket/8800] Add "mark topics read" link to "View unread posts"
| -rw-r--r-- | phpBB/search.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index c2f2d6de0d..7469daa49c 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -427,6 +427,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); $s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = ''; + + $template->assign_var('U_MARK_ALL_READ', ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : ''); break; case 'newposts': diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index f76afe3767..57d80bd804 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -33,6 +33,7 @@ <!-- EVENT search_results_searchbox_after --> <div class="pagination"> + <!-- IF U_MARK_ALL_READ --><a href="{U_MARK_ALL_READ}" class="mark-read" accesskey="m">{L_MARK_ALL_READ}</a> •<!-- ENDIF --> {SEARCH_MATCHES} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> |