Index: trunk/core/kernel/utility/formatters.php =================================================================== diff -u -r3097 -r3282 --- trunk/core/kernel/utility/formatters.php (.../formatters.php) (revision 3097) +++ trunk/core/kernel/utility/formatters.php (.../formatters.php) (revision 3282) @@ -297,7 +297,7 @@ // when we have only date field on form, we need time hidden field always empty, don't ask me why! if ( $object->GetDBField($sub_fields['date']) != '' && $object->GetDBField($sub_fields['time']) == '' ) { $empty_time = getArrayValue($options,'empty_time'); - if($empty_time === false) $empty_time = mktime(0,0,0); + if($empty_time === false) $empty_time = adodb_mktime(0,0,0); $object->SetDBField($sub_fields['time'], $empty_time); } $object->SetField($field, $object->GetField($sub_fields['date']).$options['date_time_separator'].$object->GetField($sub_fields['time'])); @@ -320,7 +320,7 @@ $options = $object->GetFieldOptions($field_name); if ( isset($format) ) $options['format'] = $format; - return date($options['format'], $value); + return adodb_date($options['format'], $value); } function HumanFormat($format) @@ -410,7 +410,7 @@ $format = $options['format']; if($dt_separator) $format = trim($format, $dt_separator); - $object->FieldErrors[$field_name]['params'] = Array( $this->HumanFormat($format), date($format) ); + $object->FieldErrors[$field_name]['params'] = Array( $this->HumanFormat($format), adodb_date($format) ); $object->FieldErrors[$field_name]['value'] = $value; $hour = 0; @@ -534,12 +534,12 @@ return $value; } // echo "day: $day, month: $month, year: $year, hour: $hour, minute: $minute
"; - return (mktime($hour, $minute, $second, $month, $day, $year)); + return adodb_mktime($hour, $minute, $second, $month, $day, $year); } function GetSample($field, &$options, &$object) { - return $this->Format( time(), $field, $object); + return $this->Format( adodb_mktime(), $field, $object); } }