]> git.mxchange.org Git - friendica.git/commitdiff
Fix ping_init SQL
authorAlexandre Alapetite <alexandre@alapetite.fr>
Wed, 12 Apr 2017 16:54:54 +0000 (18:54 +0200)
committerAlexandre Alapetite <alexandre@alapetite.fr>
Wed, 12 Apr 2017 16:54:54 +0000 (18:54 +0200)
According to review
https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628

mod/ping.php

index 0b82e71d392e3eb083cd3bdfb2af9578118954e0..ba496a70bd87bdbbe7d00f6431077c8be192eabe 100644 (file)
@@ -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');