Merge branch '0.8.x' into small-fixes

Conflicts:
	lib/peoplesearchresults.php
	lib/profilelist.php

1 files changed, 9 insertions, 15 deletions

diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 57496d0e9..09bef6f7c 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -47,26 +47,20 @@ define('PROFILES_PER_MINILIST', 27);
 
 class ProfileMiniList extends ProfileList
 {
-    function show()
+    function startList()
     {
         $this->out->elementStart('ul', 'entities users xoxo');
+    }
 
-        $cnt = 0;
-
-        while ($this->profile->fetch()) {
-            $cnt++;
-            if($cnt > PROFILES_PER_MINILIST) {
-                break;
-            }
-            $this->showProfile();
-        }
-
-        $this->out->elementEnd('ul');
-
-        return $cnt;
+    function newListItem($profile)
+    {
+        return new ProfileMiniListItem($profile, $this->action);
     }
+}
 
-    function showProfile()
+class ProfileMiniListItem extends ProfileListItem
+{
+    function show()
     {
         $this->out->elementStart('li', 'vcard');
         $this->out->elementStart('a', array('title' => $this->profile->getBestName(),