Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14407378
D15680.id37781.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D15680.id37781.diff
View Options
diff --git a/src/view/form/control/AphrontFormDateControlValue.php b/src/view/form/control/AphrontFormDateControlValue.php
--- a/src/view/form/control/AphrontFormDateControlValue.php
+++ b/src/view/form/control/AphrontFormDateControlValue.php
@@ -84,20 +84,14 @@
$value = new AphrontFormDateControlValue();
$value->viewer = $request->getViewer();
- $datetime = $request->getStr($key);
- if (strlen($datetime)) {
- $date = $datetime;
- $time = null;
- } else {
- $date = $request->getStr($key.'_d');
- $time = $request->getStr($key.'_t');
- }
-
- // If this looks like an epoch timestamp, prefix it with "@" so that
- // DateTime() reads it as one. Assume small numbers are a "Ymd" digit
- // string instead of an epoch timestamp for a time in 1970.
- if (ctype_digit($date) && ($date > 30000000)) {
- $date = '@'.$date;
+ $date = $request->getStr($key.'_d');
+ $time = $request->getStr($key.'_t');
+
+ // If we have the individual parts, we read them preferentially. If we do
+ // not, try to read the key as a raw value. This makes it so that HTTP
+ // prefilling is overwritten by the control value if the user changes it.
+ if (!strlen($date) && !strlen($time)) {
+ $date = $request->getStr($key);
$time = null;
}
@@ -239,16 +233,19 @@
private function newDateTime($date, $time) {
$date = $this->getStandardDateFormat($date);
$time = $this->getStandardTimeFormat($time);
+
try {
- $datetime = new DateTime("{$date} {$time}");
+ // We need to provide the timezone in the constructor, and also set it
+ // explicitly. If the date is an epoch timestamp, the timezone in the
+ // constructor is ignored. If the date is not an epoch timestamp, it is
+ // used to parse the date.
+ $zone = $this->getTimezone();
+ $datetime = new DateTime("{$date} {$time}", $zone);
+ $datetime->setTimezone($zone);
} catch (Exception $ex) {
return null;
}
- // Set the timezone explicitly because it is ignored in the constructor
- // if the date is an epoch timestamp.
- $zone = $this->getTimezone();
- $datetime->setTimezone($zone);
return $datetime;
}
@@ -312,6 +309,13 @@
return $colloquial[$normalized];
}
+ // If this looks like an epoch timestamp, prefix it with "@" so that
+ // DateTime() reads it as one. Assume small numbers are a "Ymd" digit
+ // string instead of an epoch timestamp for a time in 1970.
+ if (ctype_digit($date) && ($date > 30000000)) {
+ $date = '@'.$date;
+ }
+
$separator = $this->getFormatSeparator();
$parts = preg_split('@[,./:-]@', $date);
return implode($separator, $parts);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Dec 25, 2:50 AM (4 h, 46 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6924513
Default Alt Text
D15680.id37781.diff (2 KB)
Attached To
Mode
D15680: Fix an issue with date parsing when viewer timezone differs from server timezone
Attached
Detach File
Event Timeline
Log In to Comment