Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

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

diff --git a/lib/profilelist.php b/lib/profilelist.php
index bd866bed7e9544397e57150a72f8c044e40a54b0..774538a4b611de3a892c77c313b14ba2bb4a3088 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -63,8 +63,9 @@ class ProfileList extends Widget
     function show()
     {
         $this->startList();
-        $this->showProfiles();
+        $cnt = $this->showProfiles();
         $this->endList();
+        return $cnt;
     }
 
     function startList()
@@ -247,8 +248,13 @@ class ProfileListItem extends Widget
                 $usf = new UnsubscribeForm($this->out, $this->profile);
                 $usf->show();
             } else {
-                $sf = new SubscribeForm($this->out, $this->profile);
-                $sf->show();
+                // Is it a local user? can't remote sub from a list
+                // XXX: make that possible!
+                $other = User::staticGet('id', $this->profile->id);
+                if (!empty($other)) {
+                    $sf = new SubscribeForm($this->out, $this->profile);
+                    $sf->show();
+                }
             }
             $this->out->elementEnd('li');
         }