Merged with Master

modules/Settings/LayoutEditor/actions/Field.php

@@ -96,13 +96,14 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action {
         if(!empty($massEditable)){
             $fieldInstance->set('masseditable', $massEditable);
         }
-        
-        $defaultValue = $fieldInstance->get('defaultvalue');
+
+	$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);