Changeset 1457

Timestamp:

12/07/2007 05:12:47 PM (13 months ago)

Author:

zombor

Message:

Forgot AM/PM!

Files:

• trunk/modules/forge/libraries/Form_Dateselect.php (modified) (2 diffs)

trunk/modules/forge/libraries/Form_Dateselect.php

@@ -34 +34 @@
                        form::dropdown($name.'[year]', date::years(), date('Y', $date)).' @ '.
                        form::dropdown($name.'[hour]', date::hours(), date('g', $date)).':'.
-                       form::dropdown($name.'[minute]', date::minutes(), date('i', $date));
+                       form::dropdown($name.'[minute]', date::minutes(), date('i', $date)).' '.
+                       form::dropdown($name.'[am_pm]', array('AM' => 'AM', 'PM' => 'PM'), date('A', $date));
         }
 
@@ -43 +44 @@
 
                 $time = self::$input->post($this->name);
+                $am_pm = $time['am_pm'];
 
-                $this->data['value'] = mktime($time['hour'], $time['minute'], 0, $time['month'], $time['day'], $time['year']);
+                $this->data['value'] = mktime(($am_pm == 'PM') ? $time['hour']+12 : $time['hour'], $time['minute'], 0, $time['month'], $time['day'], $time['year']);
         }