X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdatetime.php;h=f4dcfce62e9fb90952a65c1158781ca7ed8a339a;hb=39927e3dc5d0fc942ef9428b5c5c0d9b8cbb2f56;hp=d44e995cfaf5e7996ef532276dac15f5cfc43034;hpb=8aa25523721303b6883e1a793f20997f8a33ec0a;p=friendica.git

diff --git a/include/datetime.php b/include/datetime.php
old mode 100755
new mode 100644
index d44e995cfa..f4dcfce62e
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -80,6 +80,16 @@ 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 throws an exception if set to empty string.
+	// Provide some sane defaults regardless.
+
+	if($from === '')
+		$from = 'UTC';
+	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 ...
 	// add 32 days so that we at least get year 00, and then hack around the fact that 
@@ -260,10 +270,11 @@ function relative_date($posted_date) {
 	);
     
 	foreach ($a as $secs => $str) {
-	$d = $etime / $secs;
-	if ($d >= 1) {
-		$r = round($d);
-		return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago');
+		$d = $etime / $secs;
+		if ($d >= 1) {
+			$r = round($d);
+			// translators - e.g. 22 hours ago, 1 minute ago
+			return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1]));
         }
     }
 }}