diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-26 22:53:26 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-26 22:53:26 +0100 |
| commit | e5595ca216b96a0f4b195b4908cc8226a98436a7 (patch) | |
| tree | 44cf82b5a4796de1ce1fbcb87d6b80d4936f69d2 | |
| parent | 48d208a3a62fea25faaba90ca131194294d810e2 (diff) | |
| parent | c814ecc1434a141f66badf7c6aeb272a18e55102 (diff) | |
| download | forums-e5595ca216b96a0f4b195b4908cc8226a98436a7.tar forums-e5595ca216b96a0f4b195b4908cc8226a98436a7.tar.gz forums-e5595ca216b96a0f4b195b4908cc8226a98436a7.tar.bz2 forums-e5595ca216b96a0f4b195b4908cc8226a98436a7.tar.xz forums-e5595ca216b96a0f4b195b4908cc8226a98436a7.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/forumlist_body.html
| -rw-r--r-- | phpBB/styles/prosilver/template/forumlist_body.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index 3e7a2cd102..f2e03630ff 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -45,7 +45,7 @@ <!-- EVENT forumlist_body_subforums_before --> <br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong> <!-- BEGIN subforum --> - <a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --> + <a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->{L_COMMA_SEPARATOR}<!-- ENDIF --> <!-- END subforum --> <!-- EVENT forumlist_body_subforums_after --> <!-- ENDIF --> |