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/adm | |
| 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/adm')
| -rw-r--r-- | phpBB/adm/style/acp_profile.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 85d37568c2..c1143e9ba4 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -56,6 +56,10 @@ <dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd> </dl> <dl> + <dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}:</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt> + <dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd> + </dl> + <dl> <dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt> <dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd> </dl> |