|
@@ -128,14 +128,21 @@ if(!function_exists('friendly_date_time')) {
|
|
function friendly_date_time($value, $includeTime = true, $default = '-', $long_year=false) {
|
|
function friendly_date_time($value, $includeTime = true, $default = '-', $long_year=false) {
|
|
if(!$value || empty($value)) return $default;
|
|
if(!$value || empty($value)) return $default;
|
|
try {
|
|
try {
|
|
- $result = strtotime($value);
|
|
|
|
|
|
+
|
|
|
|
+ $realTimezone = 'US/Eastern';
|
|
|
|
+ $date = new DateTime($value);
|
|
|
|
+ $date->setTimezone(new DateTimeZone($realTimezone));
|
|
|
|
+
|
|
|
|
+ return $date->format("m/d/y" . ($includeTime ? ", h:ia" : "")) . ($includeTime ? ' EST' : '');
|
|
|
|
+
|
|
|
|
+ /*$result = strtotime($value);
|
|
if($long_year){
|
|
if($long_year){
|
|
$result = date("m/d/Y" . ($includeTime ? ", h:ia" : ""), $result);
|
|
$result = date("m/d/Y" . ($includeTime ? ", h:ia" : ""), $result);
|
|
}else{
|
|
}else{
|
|
$result = date("m/d/y" . ($includeTime ? ", h:ia" : ""), $result);
|
|
$result = date("m/d/y" . ($includeTime ? ", h:ia" : ""), $result);
|
|
}
|
|
}
|
|
|
|
|
|
- return $result;
|
|
|
|
|
|
+ return $result;*/
|
|
}
|
|
}
|
|
catch (Exception $e) {
|
|
catch (Exception $e) {
|
|
return $value;
|
|
return $value;
|
|
@@ -147,9 +154,16 @@ if(!function_exists('friendlier_date_time')) {
|
|
function friendlier_date_time($value, $includeTime = true, $default = '-') {
|
|
function friendlier_date_time($value, $includeTime = true, $default = '-') {
|
|
if(!$value || empty($value)) return $default;
|
|
if(!$value || empty($value)) return $default;
|
|
try {
|
|
try {
|
|
- $result = strtotime($value);
|
|
|
|
|
|
+
|
|
|
|
+ $realTimezone = 'US/Eastern';
|
|
|
|
+ $date = new DateTime($value);
|
|
|
|
+ $date->setTimezone(new DateTimeZone($realTimezone));
|
|
|
|
+
|
|
|
|
+ return $date->format("m/d/y" . ($includeTime ? ", h:ia" : "")) . ($includeTime ? ' EST' : '');
|
|
|
|
+
|
|
|
|
+ /*$result = strtotime($value);
|
|
$result = date("m/d/Y" . ($includeTime ? ", h:i a" : ""), $result);
|
|
$result = date("m/d/Y" . ($includeTime ? ", h:i a" : ""), $result);
|
|
- return $result;
|
|
|
|
|
|
+ return $result;*/
|
|
}
|
|
}
|
|
catch (Exception $e) {
|
|
catch (Exception $e) {
|
|
return $value;
|
|
return $value;
|