X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdatetime.php;h=9e1d4b55c9ba622c4242ac5db3f31c3721e12639;hb=85144908fa9cf12594b568f4f0b2d37fa21b6be1;hp=779c7a5aadae7f9b46e33fa1525130bbf3abad9b;hpb=d61a4a67db0ccd428ae5b5e870027d462e44e730;p=friendica.git diff --git a/include/datetime.php b/include/datetime.php index 779c7a5aad..9e1d4b55c9 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -339,7 +339,7 @@ function relative_date($posted_date, $format = null) { $abs = strtotime($localtime); - if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) { + if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === False) { return t('never'); } @@ -571,6 +571,17 @@ function update_contact_birthdays() { * */ + // Check for duplicates + $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1", + intval($rr['uid']), + intval($rr['id']), + dbesc(datetime_convert('UTC','UTC', $nextbd)), + dbesc('birthday')); + + if (dbm::is_result($s)) { + continue; + } + $bdtext = sprintf( t('%s\'s birthday'), $rr['name']); $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;