Merge branch 'master' into security

layouts/v7/modules/Users/partials/EditViewContents.tpl

@@ -34,7 +34,7 @@
                             {continue}
                          {/if}
                          {if $FIELD_MODEL->isEditable() eq true}
-                             {if $FIELD_MODEL->get('uitype') eq "19"}
+                             {if $FIELD_MODEL->get('uitype') eq "19" || $FIELD_MODEL->get('label') eq 'Signature'}
                                  {if $COUNTER eq '1'}
                                      <td></td><td></td></tr><tr>
                                      {assign var=COUNTER value=0}
@@ -80,4 +80,4 @@
          {/if}
 		{/if}
      {/foreach}
-</div>
+</div>
\ No newline at end of file

modules/Settings/LayoutEditor/actions/Field.php

@@ -97,9 +97,13 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action {
             $fieldInstance->set('masseditable', $massEditable);
         }
 
-		$defaultValue = decode_html($request->get('fieldDefaultValue'));
-		$fieldInstance->set('defaultvalue', $defaultValue);
-		$response = new Vtiger_Response();
+	$defaultValue = $fieldInstance->get('defaultvalue');
+        if(!is_null($request->get('fieldDefaultValue', null))) {
+            $defaultValue = decode_html($request->get('fieldDefaultValue'));
+            $fieldInstance->set('defaultvalue', $defaultValue);
+        }
+	$response = new Vtiger_Response();
+        
         try{
             $fieldInstance->save();
 			$fieldInstance = Settings_LayoutEditor_Field_Model::getInstance($fieldId);