diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 10:38:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 10:38:35 +0200 |
| commit | 8bfbd7782815aeee6ada6fa8a495b780fc21cb3d (patch) | |
| tree | f37e9081dd7ec2ff0844b2676ac538cf854813fb /phpBB/adm | |
| parent | b635853479e006dd06c739e4f549f103d9b134a8 (diff) | |
| parent | 5da50fcf6e97fcc50d1f414ce0fe5fb2212fadf2 (diff) | |
| download | forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar.gz forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar.bz2 forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar.xz forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/acp/acp_profile.php
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_profile.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 64bc3df09b..3ce2d9471d 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -79,6 +79,7 @@ <dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt> <dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd> </dl> + <!-- EVENT acp_profile_contact_before --> <dl> <dt><label for="field_is_contact">{L_FIELD_IS_CONTACT}{L_COLON}</label><br /><span>{L_FIELD_IS_CONTACT_EXPLAIN}</span></dt> <dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd> |