From: mmn <mmn@hethane.se>
Date: Wed, 23 Dec 2015 21:04:18 +0000 (+0000)
Subject: Merge branch 'autocomplete-group' into 'nightly'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=48f31928e98514e24a91219c4ca37e7e14ec57b4;hp=3e830dad374c9ccceaaa24fc7b8f87c1357fc3d7;p=quix0rs-gnu-social.git

Merge branch 'autocomplete-group' into 'nightly'

Autocomplete group

Group autocompletion wasn't working for a couple of reasons:

1. $profile wasn't set (d8092207c0)
2. Profile::getUri() wasn't working for Groups, causing Profile::getAcctUri() to throw a ProfileNoAcctUriException (3e830dad374)

See merge request !68
---

diff --git a/classes/Profile_prefs.php b/classes/Profile_prefs.php
index 72a707cae8..bc7c400b89 100644
--- a/classes/Profile_prefs.php
+++ b/classes/Profile_prefs.php
@@ -85,17 +85,17 @@ class Profile_prefs extends Managed_DataObject
     static function getAll(Profile $profile)
     {
         try {
-            $prefs = self::listFind('profile_id', $profile->getID());
+            $prefs = self::listFind('profile_id', array($profile->getID()));
         } catch (NoResultException $e) {
             return array();
         }
 
         $list = array();
-        while ($entry = $prefs->fetch()) {
-            if (!isset($list[$entry->namespace])) {
-                $list[$entry->namespace] = array();
+        while ($prefs->fetch()) {
+            if (!isset($list[$prefs->namespace])) {
+                $list[$prefs->namespace] = array();
             }
-            $list[$entry->namespace][$entry->topic] = $entry->data;
+            $list[$prefs->namespace][$prefs->topic] = $prefs->data;
         }
         return $list;
     }