Correctly output commas for JSON backups

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

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 99bff9cdc031769b31e74960703111388148fcfe..e2adf57477e70e3a936168fef8ddca0b44a9c9f3 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/widget.php';
 
-define('GROUPS_PER_PAGE', 20);
-
 /**
  * Widget to show a list of groups
  *
@@ -105,6 +103,7 @@ class GroupList extends Widget
                                          'alt' =>
                                          ($this->group->fullname) ? $this->group->fullname :
                                          $this->group->nickname));
+        $this->out->text(' ');
         $hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->group->nickname));
@@ -112,16 +111,19 @@ class GroupList extends Widget
         $this->out->elementEnd('a');
 
         if ($this->group->fullname) {
+            $this->out->text(' ');
             $this->out->elementStart('span', 'fn org');
             $this->out->raw($this->highlight($this->group->fullname));
             $this->out->elementEnd('span');
         }
         if ($this->group->location) {
+            $this->out->text(' ');
             $this->out->elementStart('span', 'label');
             $this->out->raw($this->highlight($this->group->location));
             $this->out->elementEnd('span');
         }
         if ($this->group->homepage) {
+            $this->out->text(' ');
             $this->out->elementStart('a', array('href' => $this->group->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->group->homepage));
@@ -133,7 +135,7 @@ class GroupList extends Widget
             $this->out->elementEnd('p');
         }
 
-        # If we're on a list with an owner (subscriptions or subscribers)...
+        // If we're on a list with an owner (subscriptions or subscribers)...
 
         if (!empty($user) && !empty($this->owner) && $user->id == $this->owner->id) {
             $this->showOwnerControls();
@@ -145,8 +147,8 @@ class GroupList extends Widget
             $this->out->elementStart('div', 'entity_actions');
             $this->out->elementStart('ul');
             $this->out->elementStart('li', 'entity_subscribe');
-            # XXX: special-case for user looking at own
-            # subscriptions page
+            // XXX: special-case for user looking at own
+            // subscriptions page
             if ($user->isMember($this->group)) {
                 $lf = new LeaveForm($this->out, $this->group);
                 $lf->show();