diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-20 19:50:29 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-20 19:50:29 -0400 |
| commit | f9307531a74a6b4162a8725faca22b9d70bb6f12 (patch) | |
| tree | 21b6befe79ea9a04996c16f2b995b7297ee851a9 /phpBB/styles/prosilver | |
| parent | 52c4726b5b8bf762b56d0fa06b24e09003d74811 (diff) | |
| parent | 8fa44cc3b9778f84ca20eab1c1d404c4f848eab4 (diff) | |
| download | forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.gz forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.bz2 forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.xz forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
[ticket/8542] Display custom profile fields in private messages
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index af5213ae30..5317068d89 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -69,7 +69,12 @@ <dd><strong>{L_POSTS}:</strong> {AUTHOR_POSTS}</dd> <!-- IF AUTHOR_JOINED --><dd><strong>{L_JOINED}:</strong> {AUTHOR_JOINED}</dd><!-- ENDIF --> <!-- IF AUTHOR_FROM --><dd><strong>{L_LOCATION}:</strong> {AUTHOR_FROM}</dd><!-- ENDIF --> - + + <!-- BEGIN custom_fields --> + <dd><strong>{custom_fields.PROFILE_FIELD_NAME}:</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd> + <!-- END custom_fields --> + + <!-- IF U_PM or U_EMAIL or U_WWW or U_MSN or U_ICQ or U_YIM or U_AIM or U_JABBER --> <dd> <ul class="profile-icons"> |