Issue 9329: prevent "Expression #1 of SELECT list is not in GROUP BY clause"

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 38c87cf452439c7d5b2d600304a85bf7a8f438aa..99e34abd20a02390d340cc82eb7e0291d07bd247 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1296,7 +1296,7 @@ class Contact
                }
 
                if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
-                       $sql = "`item`.`uid` IN (0, ?)";
+                       $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
                } else {
                        $sql = "`item`.`uid` = ?";
                }
@@ -1330,8 +1330,7 @@ class Contact
 
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
-               $params = ['order' => ['received' => true], 'group_by' => ['uri-id'],
-                       'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+               $params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
                if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
                        $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');