Merge branch '0.8.x' into small-fixes

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

diff --cc actions/disfavor.php
Simple merge

diff --cc actions/groups.php
Simple merge

diff --cc lib/groupeditform.php
index 3014dd1c567a40e6c836e30fc67af09cc0b92129,7e8d6eea3ad93cb9d8f567e4dde8abfabe8f52b3..fbb39129bc3bc4f7b05f552b318bf0e94029b8c8
--- 1/lib/groupeditform.php
--- 2/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@@ -170,9 -153,19 +169,19 @@@ class GroupEditForm extends For
          $this->out->elementEnd('li');
          $this->out->elementStart('li');
          $this->out->input('location', _('Location'),
 -                     ($this->out->arg('location')) ? $this->out->arg('location') : $this->group->location,
 +                     ($this->out->arg('location')) ? $this->out->arg('location') : $location,
                       _('Location for the group, if any, like "City, State (or Region), Country"'));
          $this->out->elementEnd('li');
+         if (common_config('group', 'maxaliases') > 0) {
+             $aliases = (empty($this->group)) ? array() : $this->group->getAliases();
+             $this->out->elementStart('li');
+             $this->out->input('aliases', _('Aliases'),
+                               ($this->out->arg('aliases')) ? $this->out->arg('aliases') :
+                               (!empty($aliases)) ? implode(' ', $aliases) : '',
+                               sprintf(_('Extra nicknames for the group, comma- or space- separated, max %d'),
+                                       common_config('group', 'maxaliases')));;
+             $this->out->elementEnd('li');
+         }
          $this->out->elementEnd('ul');
      }
  

diff --cc lib/util.php
Simple merge