makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10173] Use an array for the legacy birthday list as per rxu.

Browse source 
PHPBB3-10173
This commit is contained in:
Andreas Fischer 2011-05-08 16:41:55 +02:00
parent 2f458352b8
commit 6a7d7285fb
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/index.php
View file

@ -81,7 +81,7 @@ $db->sql_freeresult($result);
$legend = implode(', ', $legend); $legend = implode(', ', $legend);
// Generate birthday list if required ... // Generate birthday list if required ...
$birthday_list = ''; $birthday_list = array();
if ($config['load_birthdays'] && $config['allow_birthdays']) if ($config['load_birthdays'] && $config['allow_birthdays'])
{ {
$now = getdate(time() + $user->timezone + $user->dst - date('Z')); $now = getdate(time() + $user->timezone + $user->dst - date('Z'));
@ -97,19 +97,16 @@ if ($config['load_birthdays'] && $config['allow_birthdays'])
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$birthday_username = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); $birthday_username = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
$birthday_list .= (($birthday_list != '') ? ', ' : '') . $birthday_username;
$birthday_year = (int) substr($row['user_birthday'], -4); $birthday_year = (int) substr($row['user_birthday'], -4);
$birthday_age = $now['year'] - $birthday_year; $birthday_age = $now['year'] - $birthday_year;
if ($birthday_year)
{
$birthday_list .= ' (' . $birthday_age . ')';
}
$template->assign_block_vars('birthdays', array( $template->assign_block_vars('birthdays', array(
'USERNAME' => $birthday_username, 'USERNAME' => $birthday_username,
'AGE' => ($birthday_year) ? $birthday_age : '', 'AGE' => ($birthday_year) ? $birthday_age : '',
)); ));
// For 3.0 compatibility
$birthday_list[] = $birthday_username . (($birthday_year) ? ' (' . $birthday_age . ')' : '');
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
@ -122,7 +119,7 @@ $template->assign_vars(array(
'NEWEST_USER' => sprintf($user->lang['NEWEST_USER'], get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])), 'NEWEST_USER' => sprintf($user->lang['NEWEST_USER'], get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])),
'LEGEND' => $legend, 'LEGEND' => $legend,
'BIRTHDAY_LIST' => $birthday_list, 'BIRTHDAY_LIST' => (empty($birthday_list)) ? '' : implode(', ', $birthday_list),
'FORUM_IMG' => $user->img('forum_read', 'NO_UNREAD_POSTS'), 'FORUM_IMG' => $user->img('forum_read', 'NO_UNREAD_POSTS'),
'FORUM_UNREAD_IMG' => $user->img('forum_unread', 'UNREAD_POSTS'), 'FORUM_UNREAD_IMG' => $user->img('forum_unread', 'UNREAD_POSTS'),