From de3b9e95847640a0cc8119ac0bcc0141cc0403d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 17:28:36 -0700 Subject: send zrl after dfrn_request homecoming for manual entries --- mod/dfrn_request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 5881b7b51..80d27ac30 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -180,7 +180,7 @@ function dfrn_request_post(&$a) { // (ignore reply, nothing we can do it failed) - goaway($dfrn_url); + goaway(zrl($dfrn_url)); return; // NOTREACHED } -- cgit v1.2.3 From 129130b0f7b7a10d8c2178842792193251be8c4e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 18:01:49 -0700 Subject: fix empty string timezone --- include/datetime.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/datetime.php b/include/datetime.php index 6d395fe3f..1c43813d3 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -80,6 +80,13 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang if(! function_exists('datetime_convert')) { function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") { + // Defaults to UTC if nothing is set, but not if set to empty string. + + if($from == '') + $from = 'UTC'; + if($to == '') + $to = 'UTC'; + // Slight hackish adjustment so that 'zero' datetime actually returns what is intended // otherwise we end up with -0001-11-30 ... // add 32 days so that we at least get year 00, and then hack around the fact that -- cgit v1.2.3 From c1e25968071f01a9b4f4b69541818a0fc3d7eebf Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 18:09:21 -0700 Subject: more sane defaults datetime_convert --- include/datetime.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 1c43813d3..f4dcfce62 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -80,12 +80,15 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang if(! function_exists('datetime_convert')) { function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") { - // Defaults to UTC if nothing is set, but not if set to empty string. + // Defaults to UTC if nothing is set, but throws an exception if set to empty string. + // Provide some sane defaults regardless. - if($from == '') + if($from === '') $from = 'UTC'; - if($to == '') + if($to === '') $to = 'UTC'; + if($s === '') + $s = 'now'; // Slight hackish adjustment so that 'zero' datetime actually returns what is intended // otherwise we end up with -0001-11-30 ... -- cgit v1.2.3