diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2016-05-31 18:06:53 +0200 |
|---|---|---|
| committer | Fabio Bas <ctrlaltca@gmail.com> | 2016-05-31 18:06:53 +0200 |
| commit | bd4929d6eace0b55e35a37dbbc0f43cbedc9f1ea (patch) | |
| tree | b05cc9a193edaed4b9654a4fe3b0b0b861ed403f /framework/Web | |
| parent | d129b1eed574cec2276d6cefe9261ed6b2c7ddac (diff) | |
Fix #597
Diffstat (limited to 'framework/Web')
| -rw-r--r-- | framework/Web/UI/WebControls/TDatePicker.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php index 7a164ddb..a773c69c 100644 --- a/framework/Web/UI/WebControls/TDatePicker.php +++ b/framework/Web/UI/WebControls/TDatePicker.php @@ -483,10 +483,19 @@ class TDatePicker extends TTextBox { $date = @getdate(); - if(isset($values[$key.'$day'])) + $pattern = $this->getDateFormat(); + $pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern); + $formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern); + + $order = $formatter->getDayMonthYearOrdering(); + + if(isset($values[$key.'$day'])) { $day = intval($values[$key.'$day']); - else + } elseif(in_array('day', $order)) { $day = $date['mday']; + } else { + $day = 1; + } if(isset($values[$key.'$month'])) $month = intval($values[$key.'$month']) + 1; @@ -502,9 +511,6 @@ class TDatePicker extends TTextBox $date = $s->getTimeStamp(0, 0, 0, $month, $day, $year); //$date = @mktime(0, 0, 0, $month, $day, $year); - $pattern = $this->getDateFormat(); - $pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern); - $formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern); return $formatter->format($date); } |