Merge remote branch 'gitorious/testing' into testing

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

diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 7673e96c876286c8ffa61a07a14330b4616816c1..e843dc096ca408f8a7f008cffd50749357a1d26a 100644 (file)
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -21,13 +21,13 @@
  *
  * @category  Menu
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
@@ -79,9 +79,9 @@ class SearchGroupNav extends Widget
         }
         $this->out->menuItem(common_local_url('peoplesearch', $args), _('People'),
             _('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people');
-        $this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'),
+        $this->out->menuItem(common_local_url('noticesearch', $args), _('Notices'),
             _('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
-        $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'),
+        $this->out->menuItem(common_local_url('groupsearch', $args), _('Groups'),
             _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_group');
         $this->action->elementEnd('ul');
     }