Merge branch '1.0.x' into 1.1.x

[quix0rs-gnu-social.git] / plugins / GroupFavorited / groupfavoritedaction.php

diff --git a/plugins/GroupFavorited/groupfavoritedaction.php b/plugins/GroupFavorited/groupfavoritedaction.php
index dbd37abbcfb0d422c339e3e02e3e45348b2dfdf7..dcbf7d0bc582dfab8a70b635954c4336d0d52750 100644 (file)
--- a/plugins/GroupFavorited/groupfavoritedaction.php
+++ b/plugins/GroupFavorited/groupfavoritedaction.php
@@ -41,12 +41,7 @@ class GroupFavoritedAction extends ShowgroupAction
      */
     function title()
     {
-        if (!empty($this->group->fullname)) {
-            // @todo Create a core method to create this properly. i18n issue.
-            $base = $this->group->fullname . ' (' . $this->group->nickname . ')';
-        } else {
-            $base = $this->group->nickname;
-        }
+        $base = $this->group->getFancyName();
 
         if ($this->page == 1) {
             // TRANS: %s is a group name.