From 2141e8a2af5a4038f2784690d11dfee724291d61 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 21 Jan 2013 12:35:29 -0800 Subject: [PATCH] Issue #83 - datepicker fixed existing value conversion. --- e107_handlers/form_handler.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 75aa34b24..42857cfde 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -564,32 +564,32 @@ class e_form $dateFormat = varset($options['dateformat']) ? trim($options['dateformat']) :e107::getPref('inputdate', '%Y-%m-%d'); $timeFormat = varset($options['timeformat']) ? trim($options['timeformat']) :e107::getPref('inputtime', '%H:%M:%S'); - + $type = varset($options['type']) ? trim($options['type']) : "date"; // 'datetime' // echo "TYPE=".$type; $ampm = (preg_match("/%l|%I|%p|%P/",$timeFormat)) ? 'true' : 'false'; - + $dformat = e107::getDate()->toMask($dateFormat); $tformat = e107::getDate()->toMask($timeFormat); - + $id = $this->name2id($name); - + $classes = array( 'date' => 'e-date', // 'time' => 'e-time', 'datetime' => 'e-datetime' ); - + $def = array( 'date' => $dateFormat, // 'time' => $timeFormat, 'datetime' => $dateFormat." ".$timeFormat ); - + $defdisp = (isset($def[$type])) ? $def[$type] : $def['date']; - $defdisp = e107::getDate()->toMask($defdisp); + // $defdisp = e107::getDate()->toMask($defdisp); if ($datestamp) { @@ -608,16 +608,16 @@ class e_form { $text .= "
- "; + "; } else { $text .= ""; } - + return $text; - + } /**