Merge branch 'stable-3.1'

Marius Burkard

2016-07-01 49441bdd0f3ff75d5092d5b832b97ea722a66363

 interface/lib/classes/tform_base.inc.php

@@ -562,6 +562,18 @@
                  $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
                  break;

               case 'DATE':
                  if (strtotime($val) !== false) {
                     $dt_value = $val;
                  } elseif ( isset($field['default']) && (strtotime($field['default']) !== false) ) {
                     $dt_value = $field['default'];
                  } else {
                     $dt_value = 0;
                  }

                  $new_record[$key] = $this->_getDateHTML($key, $dt_value);
                  break;
					
               default:
                  if(isset($record[$key])) {
                     $new_record[$key] = htmlspecialchars($record[$key]);
@@ -673,6 +685,12 @@
               $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
               break;

            case 'DATE':
               $dt_value = (isset($field['default'])) ? $field['default'] : 0;

               $new_record[$key] = $this->_getDateHTML($key, $dt_value);
               break;

            default:
               $new_record[$key] = htmlspecialchars($field['default']);
            }