diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-02 23:07:33 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-02 23:07:33 +0100 |
| commit | 7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b (patch) | |
| tree | 48b2f398b04f8146276459cecdfa729af5c8bab5 /phpBB/styles | |
| parent | f31d12ddf2905ae84a44b74ad9dedda059de4c3a (diff) | |
| parent | b1336ae01600b0ff6fdc9272d9c244bb3e9e14db (diff) | |
| download | forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar.gz forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar.bz2 forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar.xz forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.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 7850412cf3..3b2c0a9c65 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -249,7 +249,9 @@ <!-- ENDIF --> <!-- ENDIF --> + <!-- EVENT viewtopic_body_postrow_post_details_before --> <p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> » </span>{postrow.POST_DATE} </p> + <!-- EVENT viewtopic_body_postrow_post_details_after --> <!-- IF postrow.S_POST_UNAPPROVED --> <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> |