torrentpier/torrentpier-lts
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier-lts.git synced 2025-02-28 15:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Default value for user_birthday causes exception on user password change (#100)

Browse Source 
torrentpier/torrentpier#449
This commit is contained in:
Roman Kelesidis 2023-04-01 12:01:57 +07:00 committed by GitHub
parent 298e0c61d9
commit 7725064b89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/includes/datastore/build_stats.php
View File

@ -54,6 +54,7 @@ if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
FROM ". BB_USERS ."
WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")
AND user_birthday != '0000-00-00'
AND user_birthday IS NOT NULL
AND user_active = 1
ORDER BY user_level DESC, username
");

7
library/includes/ucp/register.php
View File

@ -334,9 +334,9 @@ foreach ($profile_fields as $field => $can_edit)
* Возраст (edit)
*/
case 'user_birthday':
$user_birthday = isset($_POST['user_birthday']) ? (string) $_POST['user_birthday'] : $pr_data['user_birthday'];
$user_birthday = !empty($_POST['user_birthday']) ? (string) $_POST['user_birthday'] : $pr_data['user_birthday'];
if ($submit && $user_birthday != $pr_data['user_birthday'])
if ($submit && $user_birthday !== $pr_data['user_birthday'])
{
$birthday_date = date_parse($user_birthday);
@ -356,8 +356,7 @@ foreach ($profile_fields as $field => $can_edit)
}
}
$pr_data['user_birthday'] = $user_birthday;
$db_data['user_birthday'] = $user_birthday;
$pr_data['user_birthday'] = $db_data['user_birthday'] = !empty($user_birthday) ? $user_birthday : null;
}
$tp_data['USER_BIRTHDAY'] = $pr_data['user_birthday'];
break;

4
library/includes/ucp/viewprofile.php
View File

@ -104,8 +104,8 @@ $template->assign_vars(array(
'TWITTER' => $profiledata['user_twitter'],
'USER_POINTS' => $profiledata['user_points'],
'GENDER' => ($bb_cfg['gender']) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '',
'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '',
'AGE' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '',
'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && !empty($profiledata['user_birthday']) && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '',
'AGE' => ($bb_cfg['birthday_enabled'] && !empty($profiledata['user_birthday']) && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '',
'L_VIEWING_PROFILE' => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']),
'L_MY_PROFILE' => sprintf($lang['VIEWING_MY_PROFILE'], 'profile.php?mode=editprofile'),

2
viewtopic.php
View File

@ -649,7 +649,7 @@ for($i = 0; $i < $total_posts; $i++)
{
$poster_id = $postrow[$i]['user_id'];
$poster = ($poster_id == GUEST_UID) ? $lang['GUEST'] : $postrow[$i]['username'];
$poster_birthday = ($poster_id != GUEST_UID && $postrow[$i]['user_birthday'] != '0000-00-00') ? date('md', strtotime($postrow[$i]['user_birthday'])) : '';
$poster_birthday = ($poster_id != GUEST_UID && !empty($postrow[$i]['user_birthday']) && $postrow[$i]['user_birthday'] != '0000-00-00') ? date('md', strtotime($postrow[$i]['user_birthday'])) : '';
$post_date = bb_date($postrow[$i]['post_time'], $bb_cfg['post_date_format']);
$max_post_time = max($max_post_time, $postrow[$i]['post_time']);
$poster_posts = ($poster_id != GUEST_UID) ? $postrow[$i]['user_posts'] : '';