diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-10 00:01:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-10 00:01:30 +0200 |
| commit | 3a167ee801d475ed86622506507c9e2465d15302 (patch) | |
| tree | c528267a530f552470e9b3e20eafcabd381a367e | |
| parent | 771cbb2b3a8d025dc1b9453227efdb726399d9d1 (diff) | |
| parent | 169a9a560d52778adc8b63c2a31254965af6f342 (diff) | |
| download | forums-3a167ee801d475ed86622506507c9e2465d15302.tar forums-3a167ee801d475ed86622506507c9e2465d15302.tar.gz forums-3a167ee801d475ed86622506507c9e2465d15302.tar.bz2 forums-3a167ee801d475ed86622506507c9e2465d15302.tar.xz forums-3a167ee801d475ed86622506507c9e2465d15302.zip | |
Merge pull request #2568 from prototech/ticket/12667
[ticket/12667] Do not point viewtopic URL to unread post outside of view=unread.
* prototech/ticket/12667:
[ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/viewtopic_body.html | 5 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index fb0b9733e7..710b42b5e3 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -117,7 +117,9 @@ <!-- BEGIN postrow --> <!-- EVENT viewtopic_body_postrow_post_before --> - <!-- IF postrow.S_FIRST_UNREAD --><a id="unread" class="anchor" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF --> + <!-- IF postrow.S_FIRST_UNREAD --> + <a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a> + <!-- ENDIF --> <div id="p{postrow.POST_ID}" class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF --><!-- IF postrow.POSTER_WARNINGS --> warned<!-- ENDIF -->"> <div class="inner"> diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html index 8f83bfbea6..c69be83a1e 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_body.html +++ b/phpBB/styles/subsilver2/template/viewtopic_body.html @@ -155,7 +155,10 @@ <!-- ELSE --> <td align="center" valign="middle"> - <!-- IF postrow.S_FIRST_UNREAD --><a id="unread" class="anchor" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF --><a name="p{postrow.POST_ID}" class="anchor"></a> + <!-- IF postrow.S_FIRST_UNREAD --> + <a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a> + <!-- ENDIF --> + <a name="p{postrow.POST_ID}" class="anchor"></a> <b class="postauthor"<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</b> </td> <td width="100%" height="25"> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 789d53c676..d13d4b444f 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -635,6 +635,7 @@ $template->assign_vars(array( 'L_RETURN_TO_FORUM' => $user->lang('RETURN_TO', $topic_data['forum_name']), 'S_VIEWTOPIC' => true, + 'S_UNREAD_VIEW' => $view == 'unread', 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx"), 'S_SEARCH_LOCAL_HIDDEN_FIELDS' => build_hidden_fields($s_search_hidden_fields), |