Fix profile wrong DISTINCT + ORDER BY

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 35a9b45206fdb260e49eb26efd5dfb116392b3e1..0b82e71d392e3eb083cd3bdfb2af9578118954e0 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -201,6 +201,7 @@ function ping_init(App $a)
                if (is_null($ev)) {
                        $ev = qu("SELECT count(`event`.`id`) AS total, 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')),
@@ -216,7 +217,7 @@ function ping_init(App $a)
 
                        if ($all_events) {
                                $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
-                               foreach ($ev as $x) {
+                               foreach($ev as $x) {
                                        $bd = false;
                                        if ($x['type'] === 'birthday') {
                                                $birthdays ++;
@@ -486,7 +487,7 @@ function ping_get_notifications($uid)
 function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
 {
        $notifications = array();
-       foreach ($notifs as $key => $notif) {
+       foreach($notifs as $key => $notif) {
                $notifications[$key . ':note'] = $notif['message'];
 
                $notifications[$key . ':@attributes'] = array(