harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gracefully recover from datetime constructor issues

Browse Source
This commit is contained in:
friendica 2012-07-11 16:20:17 -07:00
parent 6105211e73
commit 71afdf3d9c
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/datetime.php
View File

@ -100,8 +100,29 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
return str_replace('1','0',$d->format($fmt));
}
$d = new DateTime($s, new DateTimeZone($from));
$d->setTimeZone(new DateTimeZone($to));
try {
$from_obj = new DateTimeZone($from);
}
catch(Exception $e) {
$from_obj = new DateTimeZone('UTC');
}
try {
$d = new DateTime($s, $from_obj);
}
catch(Exception $e) {
logger('datetime_convert: exception: ' . $e->getMessage());
$d = newDateTime('now', $from_obj);
}
try {
$to_obj = new DateTimeZone($to);
}
catch(Exception $e) {
$to_obj = new DateTimeZone('UTC');
}
$d->setTimeZone($to_obj);
return($d->format($fmt));
}}

2
version.inc
View File

@ -1 +1 @@
2012-07-10.11
2012-07-11.12