diff options
author | friendica <info@friendica.com> | 2011-12-22 15:42:01 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2011-12-22 15:42:01 -0800 |
commit | 95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa (patch) | |
tree | ced1f9a8bc579f85e0b74f76239de76ea95cedc0 /boot.php | |
parent | ed725df5f1c1ea2484c689283e93f8f825591384 (diff) | |
parent | b602203e6c9ae4b380fa615450e1a573f47cb756 (diff) | |
download | volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.tar.gz volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.tar.bz2 volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.zip |
Merge branch 'master' into notify
Diffstat (limited to 'boot.php')
-rw-r--r-- | boot.php | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1193' ); +define ( 'FRIENDICA_VERSION', '2.3.1203' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1111 ); +define ( 'DB_UPDATE_VERSION', 1112 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1036,6 +1036,8 @@ function get_birthdays() { if($r && count($r)) { $total = 0; $now = strtotime('now'); + $cids = array(); + $istoday = false; foreach($r as $rr) { if(strlen($rr['name'])) @@ -1052,6 +1054,13 @@ function get_birthdays() { foreach($r as $rr) { if(! strlen($rr['name'])) continue; + + // avoid duplicates + + if(in_array($rr['cid'],$cids)) + continue; + $cids[] = $rr['cid']; + $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); $sparkle = ''; $url = $rr['url']; |