friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix getBirthdays() 

- Formatting optimizations
- Remove redundant ASC
This commit is contained in:
Philipp Holzer 2022-01-04 22:00:25 +01:00
parent 6eab7d9f14
commit 7b3515e706
Signed by: nupplaPhil
GPG Key ID: 24A7501396EB5432
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Model/Profile.php
View File

@ -495,7 +495,7 @@ class Profile
$bd_short = DI::l10n()->t('F d');
$cachekey = 'get_birthdays:' . local_user();
$events = DI::cache()->get($cachekey);
$events = DI::cache()->get($cachekey);
if (is_null($events)) {
$result = DBA::p(
"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
@ -508,7 +508,7 @@ class Profile
AND NOT `contact`.`archive`
AND NOT `contact`.`deleted`
WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
ORDER BY `start` ASC ",
ORDER BY `start`",
Contact::SHARING,
Contact::FRIEND,
local_user(),
@ -521,11 +521,11 @@ class Profile
}
}
$total = 0;
$total = 0;
$classtoday = '';
$tpl_events = [];
if (DBA::isResult($events)) {
$now = strtotime('now');
$now = strtotime('now');
$cids = [];
$istoday = false;
@ -563,13 +563,13 @@ class Profile
}
$tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl');
return Renderer::replaceMacros($tpl, [
'$classtoday' => $classtoday,
'$count' => $total,
'$classtoday' => $classtoday,
'$count' => $total,
'$event_reminders' => DI::l10n()->t('Birthday Reminders'),
'$event_title' => DI::l10n()->t('Birthdays this week:'),
'$events' => $tpl_events,
'$lbr' => '{', // raw brackets mess up if/endif macro processing
'$rbr' => '}'
'$event_title' => DI::l10n()->t('Birthdays this week:'),
'$events' => $tpl_events,
'$lbr' => '{', // raw brackets mess up if/endif macro processing
'$rbr' => '}'
]);
}