From b6ff71acaab74169aeef575cd20cb7cba0756c42 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 02:06:29 -0700
Subject: [PATCH] survive bad/un-parseable input to datetime_convert

---
 include/datetime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/datetime.php b/include/datetime.php
index 3b1491e4d8..f6bf1041e1 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -87,7 +87,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 		$from = 'UTC';
 	if($to === '')
 		$to = 'UTC';
-	if($s === '')
+	if($s === '' || (! is_string($s)))
 		$s = 'now';
 
 	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended