Removed old include

[friendica.git] / src / Model / Group.php

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 93346c8a58f782fa549acae210f7eef6a14ab7ff..857b972d62b4c81c4f1d02ff64e54b689f0355a8 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -62,21 +62,13 @@ class Group extends BaseObject
         */
        private static function getByContactIdForUserId($uid, $cid)
        {
-               $stmt = dba::p('SELECT `id`
-                       FROM `group`
-                       INNER JOIN `group_member`
-                               ON `group_member`.`gid` = `group`.`id`
-                       WHERE `group`.`uid` = ?
-                       AND `group_member`.`contact-id` = ?',
-                       $uid,
-                       $cid
-               );
+               $condition = ['uid' => $uid, 'contact-id' => $cid];
+               $stmt = dba::select('group_member', ['gid'], $condition);
 
                $return = [];
-               if (DBM::is_result($stmt)) {
-                       while($group = dba::fetch($stmt)) {
-                               $return[] = $group['id'];
-                       }
+
+               while ($group = dba::fetch($stmt)) {
+                       $return[] = $group['gid'];
                }
 
                return $return;
@@ -125,7 +117,7 @@ class Group extends BaseObject
         */
        public static function getIdByName($uid, $name)
        {
-               if ((! $uid) || (! strlen($name))) {
+               if (!$uid || !strlen($name)) {
                        return false;
                }
 
@@ -312,7 +304,7 @@ class Group extends BaseObject
        {
                $o = '';
 
-               $stmt = dba::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name' => 'ASC']]);
+               $stmt = dba::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name']]);
 
                $display_groups = [
                        [
@@ -371,7 +363,7 @@ class Group extends BaseObject
                        ]
                ];
 
-               $stmt = dba::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name' => 'ASC']]);
+               $stmt = dba::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name']]);
 
                $member_of = array();
                if ($cid) {