Revert "Slightly larger avatars and some box-shadow"

[quix0rs-gnu-social.git] / lib / profilelist.php

diff --git a/lib/profilelist.php b/lib/profilelist.php
index 313cf760731e9a72a41e2ffe5966269a7d01bd96..11ed8945e9b0c60195561b15ffa8bec15351bab4 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -85,15 +85,8 @@ class ProfileList extends Widget
 
     function showProfiles()
     {
-        // Note: we don't use fetchAll() because it's borked with query()
-
-        $profiles = array();
-
-        while ($this->profile->fetch()) {
-            $profiles[] = clone($this->profile);
-        }
-
-        $cnt = count($profiles);
+        $cnt = $this->profile->N;
+        $profiles = $this->profile->fetchAll();
 
         $max = min($cnt, $this->maxProfiles());
 
@@ -199,10 +192,10 @@ class ProfileListItem extends Widget
 
     function showAvatar()
     {
-        $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
+        $avatarUrl = $this->profile->avatarUrl(AVATAR_STREAM_SIZE);
         $aAttrs = $this->linkAttributes();
         $this->out->elementStart('a', $aAttrs);
-        $this->out->element('img', array('src' => (!empty($avatar)) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
+        $this->out->element('img', array('src' => $avatarUrl,
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
                                          'height' => AVATAR_STREAM_SIZE,