aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-17 15:58:33 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-03-17 15:58:33 +0100
commit772dd0def6cacdc72456bd26c4f8d9f838c28b67 (patch)
treeeda02915f4bc857a981094d4a459e99d8ecefbe8
parent6fba2c6778b33c217649ab4b3c58ab12363b8cd6 (diff)
parent1e1a54882c0a8e45279aae1866adf97eebcb7f38 (diff)
downloadforums-772dd0def6cacdc72456bd26c4f8d9f838c28b67.tar
forums-772dd0def6cacdc72456bd26c4f8d9f838c28b67.tar.gz
forums-772dd0def6cacdc72456bd26c4f8d9f838c28b67.tar.bz2
forums-772dd0def6cacdc72456bd26c4f8d9f838c28b67.tar.xz
forums-772dd0def6cacdc72456bd26c4f8d9f838c28b67.zip
Merge remote-tracking branch 'rxu3/ticket/12279' into develop
* rxu3/ticket/12279: [ticket/12279] Add memberlist_view.html template event to add custom info
-rw-r--r--phpBB/docs/events.md8
-rw-r--r--phpBB/styles/prosilver/template/memberlist_view.html2
-rw-r--r--phpBB/styles/subsilver2/template/memberlist_view.html2
3 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 57a47cbf84..97be92933e 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -160,6 +160,14 @@ memberlist_body_username_prepend
* Purpose: Add information before every username in the memberlist. Works in
all display modes (leader, group and normal memberlist).
+memberlist_view_content_append
+===
+* Locations:
+ + styles/prosilver/template/memberlist_view.html
+ + styles/subsilver2/template/memberlist_view.html
+* Since: 3.1.0-b2
+* Purpose: Add custom content to the user profile view after the main content
+
memberlist_view_user_statistics_after
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 6dc8293551..ecbde97b80 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -119,6 +119,8 @@
</form>
+<!-- EVENT memberlist_view_content_append -->
+
<!-- INCLUDE jumpbox.html -->
<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 28f4da4fef..d4547d822d 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -178,6 +178,8 @@
</form>
+ <!-- EVENT memberlist_view_content_append -->
+
</div>
<br clear="all" />