Merge branch '0.9.x' into finish-account-api

* 0.9.x:
  Added a events for the settings menu items
  Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
  Changed to Evan's event style and added an AuthPlugin superclass
  add geo output to statuses in json, xml, atom, rss in API
  Localisation updates from translatewiki.net (2009-11-10)
  Localisation updates from translatewiki.net
  Update pot
  add lat and long parameters to api/statuses/update
  change credential check to work more like other events
  fixup output of object attributes in db error code
  Performance fix for subscription/subscriber lists based on feedback from ops.
  Adjusting indexes to make favorites query more efficient, based on feedback from ops.
  Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
  Added hook for the Group navigation items
  Updated block @title text (shouldn't say from group)
  Updated group block markup
  Revert "Remove more contractions"

1 files changed, 41 insertions, 38 deletions

diff --git a/lib/groupnav.php b/lib/groupnav.php
index 31cf378c8..131b38fa2 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -79,46 +79,49 @@ class GroupNav extends Widget
         $nickname = $this->group->nickname;
 
         $this->out->elementStart('ul', array('class' => 'nav'));
-        $this->out->menuItem(common_local_url('showgroup', array('nickname' =>
-                                                                 $nickname)),
-                             _('Group'),
-                             sprintf(_('%s group'), $nickname),
-                             $action_name == 'showgroup',
-                             'nav_group_group');
-        $this->out->menuItem(common_local_url('groupmembers', array('nickname' =>
-                                                                    $nickname)),
-                             _('Members'),
-                             sprintf(_('%s group members'), $nickname),
-                             $action_name == 'groupmembers',
-                             'nav_group_members');
+        if (Event::handle('StartGroupGroupNav', array($this))) {
+            $this->out->menuItem(common_local_url('showgroup', array('nickname' =>
+                                                                     $nickname)),
+                                 _('Group'),
+                                 sprintf(_('%s group'), $nickname),
+                                 $action_name == 'showgroup',
+                                 'nav_group_group');
+            $this->out->menuItem(common_local_url('groupmembers', array('nickname' =>
+                                                                        $nickname)),
+                                 _('Members'),
+                                 sprintf(_('%s group members'), $nickname),
+                                 $action_name == 'groupmembers',
+                                 'nav_group_members');
 
-        $cur = common_current_user();
+            $cur = common_current_user();
 
-        if ($cur && $cur->isAdmin($this->group)) {
-            $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' =>
-                                                                            $nickname)),
-                                 _('Blocked'),
-                                 sprintf(_('%s blocked users'), $nickname),
-                                 $action_name == 'blockedfromgroup',
-                                 'nav_group_blocked');
-            $this->out->menuItem(common_local_url('editgroup', array('nickname' =>
-                                                                     $nickname)),
-                                 _('Admin'),
-                                 sprintf(_('Edit %s group properties'), $nickname),
-                                 $action_name == 'editgroup',
-                                 'nav_group_admin');
-            $this->out->menuItem(common_local_url('grouplogo', array('nickname' =>
-                                                                     $nickname)),
-                                 _('Logo'),
-                                 sprintf(_('Add or edit %s logo'), $nickname),
-                                 $action_name == 'grouplogo',
-                                 'nav_group_logo');
-            $this->out->menuItem(common_local_url('groupdesignsettings', array('nickname' =>
-                                                                  $nickname)),
-                                 _('Design'),
-                                 sprintf(_('Add or edit %s design'), $nickname),
-                                 $action_name == 'groupdesignsettings',
-                                 'nav_group_design');
+            if ($cur && $cur->isAdmin($this->group)) {
+                $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' =>
+                                                                                $nickname)),
+                                     _('Blocked'),
+                                     sprintf(_('%s blocked users'), $nickname),
+                                     $action_name == 'blockedfromgroup',
+                                     'nav_group_blocked');
+                $this->out->menuItem(common_local_url('editgroup', array('nickname' =>
+                                                                         $nickname)),
+                                     _('Admin'),
+                                     sprintf(_('Edit %s group properties'), $nickname),
+                                     $action_name == 'editgroup',
+                                     'nav_group_admin');
+                $this->out->menuItem(common_local_url('grouplogo', array('nickname' =>
+                                                                         $nickname)),
+                                     _('Logo'),
+                                     sprintf(_('Add or edit %s logo'), $nickname),
+                                     $action_name == 'grouplogo',
+                                     'nav_group_logo');
+                $this->out->menuItem(common_local_url('groupdesignsettings', array('nickname' =>
+                                                                      $nickname)),
+                                     _('Design'),
+                                     sprintf(_('Add or edit %s design'), $nickname),
+                                     $action_name == 'groupdesignsettings',
+                                     'nav_group_design');
+            }
+            Event::handle('EndGroupGroupNav', array($this));
         }
         $this->out->elementEnd('ul');
     }