Merge remote-tracking branch 'upstream/develop' into rework-notifications
This commit is contained in:
commit
21af40b2f9
1 changed files with 2 additions and 1 deletions
|
@ -185,7 +185,7 @@ function ping_init(App $a)
|
||||||
"SELECT `intro`.`id`, `intro`.`datetime`,
|
"SELECT `intro`.`id`, `intro`.`datetime`,
|
||||||
`contact`.`name`, `contact`.`url`, `contact`.`photo`
|
`contact`.`name`, `contact`.`url`, `contact`.`photo`
|
||||||
FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
|
FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
|
||||||
WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND `intro`.`fid` = 0",
|
WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
|
||||||
intval(local_user())
|
intval(local_user())
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -346,6 +346,7 @@ function ping_init(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
$notification['timestamp'] = DateTimeFormat::local($notification['date']);
|
$notification['timestamp'] = DateTimeFormat::local($notification['date']);
|
||||||
|
$notification['date'] = Temporal::getRelativeDate($notification['date']);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue