Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 13:44:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add contact conditions to getBirthdays/updateBirthdays

Browse source
This commit is contained in:
Hypolite Petovan 2018-11-22 00:15:44 -05:00
parent de5ee56d2f
commit 14df030f44
2 changed files with 32 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Model/Profile.php
View file

@ -572,9 +572,18 @@ class Profile
if (is_null($r)) {
$s = DBA::p(
"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
INNER JOIN `contact`
ON `contact`.`id` = `event`.`cid`
AND (`contact`.`rel` = ? OR `contact`.`rel` = ?)
AND NOT `contact`.`pending`
AND NOT `contact`.`hidden`
AND NOT `contact`.`blocked`
AND NOT `contact`.`archive`
AND NOT `contact`.`deleted`
WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
ORDER BY `start` ASC ",
Contact::SHARING,
Contact::FRIEND,
local_user(),
DateTimeFormat::utc('now + 6 days'),
DateTimeFormat::utcNow()