From 9677cec5e997fbcfc576785a03b5c69ca3ed712f Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 5 Jun 2016 13:31:23 -0700 Subject: [PATCH] Fixes #1683 - Disable extended user field checks when not present. --- e107_admin/users.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/e107_admin/users.php b/e107_admin/users.php index bdfa969fa..c6075bc3a 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -367,9 +367,17 @@ class users_admin_ui extends e_admin_ui } } + + if(empty($this->extended)) + { + $this->tabs = false; + } + + + $this->fields['user_signature']['writeParms']['data'] = e107::getUserClass()->uc_required_class_list("classes"); - $this->fields['user_signature'] = array('title' => LAN_USER_09, 'type' => 'textarea', 'data'=>'str', 'width' => 'auto'); + $this->fields['user_signature'] = array('title' => LAN_USER_09, 'type' => 'textarea', 'data'=>'str', 'width' => 'auto', 'writeParms'=>array('size'=>'xxlarge')); $this->fields['options'] = array('title'=> LAN_OPTIONS, 'type' => 'method', 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'left'); @@ -504,13 +512,12 @@ class users_admin_ui extends e_admin_ui $update['data'][$key] = vartrue($new_data['ue'][$key],'_NULL_'); } - e107::getUserExt()->addFieldTypes($update); - - - e107::getMessage()->addDebug(print_a($new_data,true)); + e107::getMessage()->addDebug(print_a($update,true)); if(!empty($update)) { + e107::getUserExt()->addFieldTypes($update); + if(!e107::getDb()->count('user_extended', '(user_extended_id)', "user_extended_id=".intval($new_data['submit_value']))) { $update['data']['user_extended_id'] = intval($new_data['submit_value']);