mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-23 03:19:01 +01:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
This commit is contained in:
commit
8ad58645fe
@ -85,12 +85,20 @@ $birthday_list = array();
|
||||
if ($config['load_birthdays'] && $config['allow_birthdays'])
|
||||
{
|
||||
$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
|
||||
|
||||
// Display birthdays of 29th february on 28th february in non-leap-years
|
||||
$leap_year_birthdays = '';
|
||||
if ($now['mday'] == 28 && $now['mon'] == 2 && !$user->format_date(time(), 'L'))
|
||||
{
|
||||
$leap_year_birthdays = " OR user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
|
||||
}
|
||||
|
||||
$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday
|
||||
FROM ' . USERS_TABLE . ' u
|
||||
LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid)
|
||||
WHERE (b.ban_id IS NULL
|
||||
OR b.ban_exclude = 1)
|
||||
AND u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%'
|
||||
AND (u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' $leap_year_birthdays)
|
||||
AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user