diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:25:26 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:25:26 +0100 |
| commit | ba90746ce5325c75fd0ed53d7b0185ae2d74a614 (patch) | |
| tree | 0159717ff638d773028d29d04b75d9573b56c0ba /phpBB/styles | |
| parent | 1ed61fc39fe6280ef79c155ab956be741c9ed21d (diff) | |
| parent | 874356e57f2de62260e455b6063330d1eb3badf4 (diff) | |
| download | forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar.gz forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar.bz2 forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar.xz forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/viewtopic_body.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 48bcc2e922..7850412cf3 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -137,7 +137,9 @@ <!-- ENDIF --> <!-- EVENT viewtopic_body_avatar_after --> </div> + <!-- EVENT viewtopic_body_post_author_before --> <!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --> + <!-- EVENT viewtopic_body_post_author_after --> </dt> <!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF --> |