From 922166f3c910969e8470e1c9fa657b270fe65cd0 Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Mon, 5 Aug 2013 03:11:08 -0400
Subject: Issue #1392852 by Shawn DeArmond, bulldozer2003 | davidwbarratt:
 Fixed User registration form field displays when user field is locked
 accompanied by error message.

---
 modules/user/user.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

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.'),
-- 
cgit v1.2.3