diff options
author | jeroenpraat <jeroenpraat@xs4all.nl> | 2014-06-05 14:00:05 +0000 |
---|---|---|
committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2014-06-05 14:00:05 +0000 |
commit | 6ccf6455c4691ca2e90403ff9fbaa21b86512190 (patch) | |
tree | d997ab65cffdf4136e6b56c3297dd028cfe9b2c1 /include/zot.php | |
parent | d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2 (diff) | |
parent | 48f856e84cb117b6224ae7a1e0cac30070f1af24 (diff) | |
download | volse-hubzilla-6ccf6455c4691ca2e90403ff9fbaa21b86512190.tar.gz volse-hubzilla-6ccf6455c4691ca2e90403ff9fbaa21b86512190.tar.bz2 volse-hubzilla-6ccf6455c4691ca2e90403ff9fbaa21b86512190.zip |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index 578bdde49..9cdcbf2a4 100644 --- a/include/zot.php +++ b/include/zot.php @@ -364,6 +364,13 @@ function zot_refresh($them,$channel = null, $force = false) { if($r) { + // if the dob is the same as what we have stored (disregarding the year), keep the one + // we have as we may have updated the year after sending a notification; and resetting + // to the one we just received would cause us to create duplicated events. + + if(substr($r[0]['abook_dob'],5) == substr($next_birthday,5)) + $next_birthday = $r[0]['abook_dob']; + $current_abook_connected = (($r[0]['abook_flags'] & ABOOK_FLAG_UNCONNECTED) ? 0 : 1); $y = q("update abook set abook_their_perms = %d, abook_dob = '%s' |