mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1687 from lonalore/master

Browse Source 
Fix for datepicker.
This commit is contained in:
Cameron
2016-06-07 08:39:31 -07:00
parent f8a62f6af9 0c29ac2708
commit 3cff407d62
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/form_handler.php
View File

@@ -992,22 +992,22 @@ class e_form
// If default value is set. // If default value is set.
if ($datestamp) if ($datestamp)
{ {
if(!is_numeric($datestamp))
{
$datestamp = strtotime($datestamp);
}
// Create timestamp. // Create timestamp.
if($useUnix == 'true') if($useUnix == 'true')
{ {
if(!is_numeric($datestamp)) // Use date value as timestamp.
{ $value = $datestamp;
$datestamp = strtotime($datestamp);
}
// Convert date to proper format.
$value = e107::getDate()->convert_date($datestamp, $dateFormat);
} }
else else
{ {
$value= $datestamp; // Convert date to proper (selected) format.
$value = e107::getDate()->convert_date($datestamp, $dateFormat);
} }
} }
@@ -1031,7 +1031,7 @@ class e_form
else else
{ {
$text .= "<input class='{$class} input-".$xsize." form-control' type='text' size='{$size}' id='e-datepicker-{$id}' value='{$value}' data-date-unix ='{$useUnix}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} {$disabled} />"; $text .= "<input class='{$class} input-".$xsize." form-control' type='text' size='{$size}' id='e-datepicker-{$id}' value='{$value}' data-date-unix ='{$useUnix}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} {$disabled} />";
$text .= "<input type='hidden' name='{$name}' id='{$id}' value='{$datestamp}' />"; $text .= "<input type='hidden' name='{$name}' id='{$id}' value='{$value}' />";
} }
// $text .= "ValueFormat: ".$dateFormat." Value: ".$value; // $text .= "ValueFormat: ".$dateFormat." Value: ".$value;