Fixed order of value check and processing

modules/Settings/LayoutEditor/actions/Field.php

@@ -129,13 +129,13 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action {
 			if (isset($defaultValue)) {
 				if ($defaultValue && $fieldInfo['type'] == 'date') {
 					$defaultValue = DateTimeField::convertToUserFormat($defaultValue);
-				} else if ($defaultValue) {
-					$defaultValue = $fieldInstance->getDisplayValue($defaultValue);
 				} else if (is_array($defaultValue)) {
 					foreach ($defaultValue as $key => $value) {
 						$defaultValue[$key] = $fieldInstance->getDisplayValue($value);
 					}
 					$defaultValue = Zend_Json::encode($defaultValue);
+				} else if ($defaultValue) {
+					$defaultValue = $fieldInstance->getDisplayValue($defaultValue);
 				}
 			}
 			$fieldInfo['fieldDefaultValue'] = $defaultValue;