diff options
author | David Rothstein <drothstein@gmail.com> | 2013-08-05 03:11:08 -0400 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2013-08-05 03:11:08 -0400 |
commit | 922166f3c910969e8470e1c9fa657b270fe65cd0 (patch) | |
tree | 300bf32e2cd983a401ca02b2d3924e75812c3004 /modules | |
parent | ba07bea34e7934006891ecd8b85be2b02f2c395d (diff) | |
download | brdo-922166f3c910969e8470e1c9fa657b270fe65cd0.tar.gz brdo-922166f3c910969e8470e1c9fa657b270fe65cd0.tar.bz2 |
Issue #1392852 by Shawn DeArmond, bulldozer2003 | davidwbarratt: Fixed User registration form field displays when user field is locked accompanied by error message.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/user/user.module | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 5dcd203f1..844dbd104 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -3701,7 +3701,7 @@ function user_block_user_action(&$entity, $context = array()) { function user_form_field_ui_field_edit_form_alter(&$form, &$form_state, $form_id) { $instance = $form['#instance']; - if ($instance['entity_type'] == 'user') { + if ($instance['entity_type'] == 'user' && !$form['#field']['locked']) { $form['instance']['settings']['user_register_form'] = array( '#type' => 'checkbox', '#title' => t('Display on user registration form.'), |