Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index ac57d1e519626bbf6d59c94655b2365eaa9c1c8b..3636288b282e2576df84d07af0def2a9725d1f91 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.913' );
+define ( 'FRIENDIKA_VERSION',      '2.1.921' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
-define ( 'DB_UPDATE_VERSION',      1040   );
+define ( 'DB_UPDATE_VERSION',      1043   );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -2410,11 +2410,19 @@ function get_birthdays() {
        );
 
        if($r && count($r)) {
-               $o .= '<div id="birthday-wrapper"><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
+               $total = 0;
+               foreach($r as $rr)
+                       if(strlen($rr['name']))
+                               $total ++;
+
+               $o .= '<div id="birthday-notice" class="birthday-notice fakelink" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
+               $o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
                $o .= '<div id="birthday-adjust">' . t("\x28Adjusted for local time\x29") . '</div>';
                $o .= '<div id="birthday-title-end"></div>';
 
                foreach($r as $rr) {
+                       if(! strlen($rr['name']))
+                               continue;
                        $now = strtotime('now');
                        $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
 
@@ -2424,7 +2432,7 @@ function get_birthdays() {
                        . '</div>' ;
                }
 
-               $o .= '</div>';
+               $o .= '</div></div>';
        }
 
   return $o;