X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=bcc858fa18457c78a5d2bb33439148fc9493bf44;hb=aca8c8a13a8c3a850cad26efbc1e262b99c7b8a3;hp=c604e4f77eefb7a19d82be2531167be8badda1d7;hpb=4f2d516920b708ffedd9b8fc60e34b6f9326c644;p=friendica.git diff --git a/boot.php b/boot.php index c604e4f77e..bcc858fa18 100644 --- a/boot.php +++ b/boot.php @@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1194' ); +define ( 'FRIENDICA_VERSION', '2.3.1208' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1111 ); +define ( 'DB_UPDATE_VERSION', 1112 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -701,7 +701,7 @@ function login($register = false, $hiddens=false) { '$lpassword' => array('password', t('Password: '), '', ''), '$openid' => !$noid, - '$lopenid' => array('openid_url', t('OpenID: '),'',''), + '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''), '$hiddens' => $hiddens, @@ -830,7 +830,7 @@ function profile_load(&$a, $nickname, $profile = 0) { } if(($r === false) || (! count($r))) { - notice( t('No profile') . EOL ); + notice( t('Requested profile is not available.') . EOL ); $a->error = 404; return; } @@ -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'];