From 534ea6aefcc480bcd01cfd478cc7f75d2f4373d2 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 12 Apr 2017 18:54:54 +0200 Subject: [PATCH] Fix ping_init SQL According to review https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628 --- mod/ping.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/ping.php b/mod/ping.php index 0b82e71d3..ba496a70b 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -199,9 +199,8 @@ function ping_init(App $a) $cachekey = "ping_init:".local_user(); $ev = Cache::get($cachekey); if (is_null($ev)) { - $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` + $ev = qu("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 - GROUP BY type, start, adjust ORDER BY `start` ASC ", intval(local_user()), dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')), @@ -213,7 +212,7 @@ function ping_init(App $a) } if (dbm::is_result($ev)) { - $all_events = intval($ev[0]['total']); + $all_events = count($ev); if ($all_events) { $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');