Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / actions / blockedfromgroup.php

diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 6ff572c05d9dea64a4723b059f9d756fe1c6a1eb..07ed41e4142642d76f27b17aafeb53751915be26 100644 (file)
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -40,7 +40,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class BlockedfromgroupAction extends GroupDesignAction
+class BlockedfromgroupAction extends GroupAction
 {
     var $page = null;
 
@@ -122,7 +122,7 @@ class BlockedfromgroupAction extends GroupDesignAction
                        _('A list of the users blocked from joining this group.'));
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();