X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdatetime.php;h=a056eaa60e34492158f09fc4bd19d29869655a17;hb=a13eaf915c70a69f877605622b249cc1c2c46621;hp=8f2ec311a019a775853bc786abc3448777736bcf;hpb=9f51233451ad6392b61083cf61f5670bcce9d935;p=friendica.git

diff --git a/include/datetime.php b/include/datetime.php
index 8f2ec311a0..a056eaa60e 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -65,9 +65,9 @@ if(! function_exists('datetime_convert')) {
 function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
 
 	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
-        // otherwise we end up with -0001-11-30 ...
+	// 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 
-        // months and days always start with 1. 
+	// months and days always start with 1. 
 
 	if(substr($s,0,10) == '0000-00-00') {
 		$d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
@@ -122,14 +122,14 @@ function datesel($pre,$ymin,$ymax,$allow_blank,$y,$m,$d) {
 	}
   
 	$o .= "</select> <select name=\"{$pre}month\" class=\"{$pre}month\" size=\"1\">";
-	for($x = 0; $x <= 12; $x ++) {
+	for($x = (($allow_blank) ? 0 : 1); $x <= 12; $x ++) {
 		$sel = (($x == $m) ? " selected=\"selected\" " : "");
 		$y = (($x) ? $x : '');
 		$o .= "<option value=\"$x\" $sel>$y</option>";
 	}
 
 	$o .= "</select> <select name=\"{$pre}day\" class=\"{$pre}day\" size=\"1\">";
-	for($x = 0; $x <= 31; $x ++) {
+	for($x = (($allow_blank) ? 0 : 1); $x <= 31; $x ++) {
 		$sel = (($x == $d) ? " selected=\"selected\" " : "");
 		$y = (($x) ? $x : '');
 		$o .= "<option value=\"$x\" $sel>$y</option>";
@@ -176,6 +176,11 @@ function relative_date($posted_date) {
 	$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); 
 
 	$abs = strtotime($localtime);
+    
+    if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) {
+		 return t('never');
+	}
+
 	$etime = time() - $abs;
     
 	if ($etime < 1) {
@@ -183,12 +188,12 @@ function relative_date($posted_date) {
 	}
     
 	$a = array( 12 * 30 * 24 * 60 * 60  =>  array( t('year'),   t('years')),
-		    30 * 24 * 60 * 60       =>  array( t('month'),  t('months')),
-		    7  * 24 * 60 * 60       =>  array( t('week'),   t('weeks')),
-		    24 * 60 * 60            =>  array( t('day'),    t('days')),
-		    60 * 60                 =>  array( t('hour'),   t('hours')),
-		    60                      =>  array( t('minute'), t('minutes')),
-		    1                       =>  array( t('second'), t('seconds'))
+				30 * 24 * 60 * 60       =>  array( t('month'),  t('months')),
+				7  * 24 * 60 * 60       =>  array( t('week'),   t('weeks')),
+				24 * 60 * 60            =>  array( t('day'),    t('days')),
+				60 * 60                 =>  array( t('hour'),   t('hours')),
+				60                      =>  array( t('minute'), t('minutes')),
+				1                       =>  array( t('second'), t('seconds'))
 	);
     
 	foreach ($a as $secs => $str) {