Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/groupsnav.php b/lib/groupsnav.php
index 8e5d1a39fb60584f29b001103c74f5fb8ce0ca24..738604583ca3f07c35391ea6e35b3dd00987a4b9 100644 (file)
--- a/lib/groupsnav.php
+++ b/lib/groupsnav.php
@@ -72,9 +72,9 @@ class GroupsNav extends MoreMenu
 
         while ($this->groups instanceof User_group && $this->groups->fetch()) {
             $items[] = array('placeholder',
-                             array('nickname' => $this->groups->nickname,
+                             array('nickname' => $this->groups->getNickname(),
                                    'mainpage' => $this->groups->homeUrl()),
-                             $this->groups->getBestName(),
+                             $this->groups->getNickname(),
                              $this->groups->getBestName()
                             );
         }
@@ -91,7 +91,7 @@ class GroupsNav extends MoreMenu
                      _('See all groups you belong to.'));
     }
 
-    function item($actionName, $args, $label, $description, $id=null, $cls=null)
+    function item($actionName, array $args, $label, $description, $id=null, $cls=null)
     {
         if ($actionName != 'placeholder') {
             return parent::item($actionName, $args, $label, $description, $id, $cls);