|
@@ -13,7 +13,7 @@ |
|
|
block discarded – undo |
|
13
|
13
|
$timestamp = new DateTime($this->value, new DateTimeZone(date_default_timezone_get())); |
|
14
|
14
|
//if a user is logged in, has set a timezone that is in the allowed list and |
|
15
|
15
|
//that timezone is NOT the default one then convert the timestamp to use the selected timezone |
|
16
|
|
- if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()){ |
|
|
16
|
+ if (Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()) { |
|
17
|
17
|
$timestamp->setTimezone(new DateTimeZone(Member::CurrentUser()->Timezone)); |
|
18
|
18
|
} |
|
19
|
19
|
//return timestamp in "Nice" format + the user's timezone |
Please login to merge, or discard this patch.