diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-01-30 16:56:16 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-01-30 16:56:16 -0600 |
| commit | 67c85fa4d3adce385958762a2f55cd5aaeecc733 (patch) | |
| tree | 73de91151d7a54447f2803df08ef4ad61a701002 | |
| parent | 2df2f27b968b6a8c837d7b1f78ff7efce8b52673 (diff) | |
| parent | 5154c6960d5d22b7fc2fab890056ce5c047c08a4 (diff) | |
| download | forums-67c85fa4d3adce385958762a2f55cd5aaeecc733.tar forums-67c85fa4d3adce385958762a2f55cd5aaeecc733.tar.gz forums-67c85fa4d3adce385958762a2f55cd5aaeecc733.tar.bz2 forums-67c85fa4d3adce385958762a2f55cd5aaeecc733.tar.xz forums-67c85fa4d3adce385958762a2f55cd5aaeecc733.zip | |
Merge branch 'develop-olympus' into develop
# By Senky
# Via Nathaniel Guse (1) and Senky (1)
* develop-olympus:
[ticket/10050] removing prosilver edits
[ticket/10050] adding .topicrow to template condition
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
| -rw-r--r-- | phpBB/styles/subsilver2/template/viewforum_body.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html index c5e66a07ca..664a6a26c5 100644 --- a/phpBB/styles/subsilver2/template/viewforum_body.html +++ b/phpBB/styles/subsilver2/template/viewforum_body.html @@ -164,7 +164,7 @@ <table width="100%" cellspacing="0"> <tr class="nav"> <td valign="middle"> <!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --><a href="{U_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td> - <td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF --> </td> + <td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF --> </td> </tr> </table> </td> |