Merge branch '1510-event-guid' of github.com:annando/friendica into 1510-event-guid

This commit is contained in:
Michael Vogel 2015-10-17 08:29:22 +02:00
commit 2178be9863
1 changed files with 2 additions and 1 deletions

View File

@ -2421,7 +2421,8 @@ function diaspora_profile($importer,$xml,$msg) {
$birthday = str_replace('1000','1901',$birthday);
$birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d');
if ($birthday != "")
$birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d');
// this is to prevent multiple birthday notifications in a single year
// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year