Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

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

diff --git a/lib/profilelist.php b/lib/profilelist.php
index ae875ac011a9d6843720a0a76bb6438aa668a5de..693cd64492b26fde8c0a6e0a639ea7db43137a50 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -86,21 +86,16 @@ class ProfileList extends Widget
 
     function showProfiles()
     {
-        $log = strtolower(get_class($this)) == 'subscriberslist' && $this->owner->nickname == 'petercook';
         $cnt = 0;
 
-        if ($log) common_log(LOG_INFO, "subbug: starting with {$this->profile->N}");
         while ($this->profile->fetch()) {
             $cnt++;
             if($cnt > PROFILES_PER_PAGE) {
-                if ($log) common_log(LOG_INFO, "subbug: breaking at $cnt");
                 break;
             }
-            if ($log) common_log(LOG_INFO, "subbug: showing at $cnt");
             $pli = $this->newListItem($this->profile);
             $pli->show();
         }
-        if ($log) common_log(LOG_INFO, "subbug: ended at $cnt");
 
         return $cnt;
     }
@@ -196,6 +191,7 @@ class ProfileListItem extends Widget
                                          'alt' =>
                                          ($this->profile->fullname) ? $this->profile->fullname :
                                          $this->profile->nickname));
+        $this->out->text(' ');
         $hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->profile->nickname));
@@ -206,6 +202,7 @@ class ProfileListItem extends Widget
     function showFullName()
     {
         if (!empty($this->profile->fullname)) {
+            $this->out->text(' ');
             $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
@@ -215,6 +212,7 @@ class ProfileListItem extends Widget
     function showLocation()
     {
         if (!empty($this->profile->location)) {
+            $this->out->text(' ');
             $this->out->elementStart('span', 'location');
             $this->out->raw($this->highlight($this->profile->location));
             $this->out->elementEnd('span');
@@ -224,6 +222,7 @@ class ProfileListItem extends Widget
     function showHomepage()
     {
         if (!empty($this->profile->homepage)) {
+            $this->out->text(' ');
             $this->out->elementStart('a', array('href' => $this->profile->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->profile->homepage));