diff options
author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
---|---|---|
committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
commit | 9d2afc2d3c12f6b70eae11487e491e2d8604ed60 (patch) | |
tree | ced4fb400d25762866a773115b122f6c9cc498de /boot.php | |
parent | 019b735ec75989336826e5ad5db6377803ecb050 (diff) | |
parent | 2e43b291e73f6d7c36a9d8743fc2635dc3444841 (diff) | |
download | volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.gz volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.bz2 volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.zip |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'boot.php')
-rw-r--r-- | boot.php | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -8,7 +8,7 @@ require_once("include/pgettext.php"); require_once('include/nav.php'); -define ( 'FRIENDIKA_VERSION', '2.2.1096' ); +define ( 'FRIENDIKA_VERSION', '2.2.1103' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1087 ); @@ -991,7 +991,7 @@ function get_birthdays() { $now = strtotime('now'); $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); - $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" href="' + $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" target="redir" href="' . $a->get_baseurl() . '/redir/' . $rr['cid'] . '">' . $rr['name'] . '</a> ' . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '') . '</div>' ; |