summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <git@evanprodromou.name>2009-01-23 09:01:06 +0100
committerEvan Prodromou <git@evanprodromou.name>2009-01-23 09:01:06 +0100
commite7d5310a2f222a695720b7a63543085ff14af9fd (patch)
treeb86011952299f00f86d4b90a3a7d499272460b1f /lib
parenta7c85bebd5be9ea019a8c80d74730d7eb28d4651 (diff)
parentaa100884fbfb7f14613f402b5eabdcd9637faf57 (diff)
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
Diffstat (limited to 'lib')
-rw-r--r--lib/searchgroupnav.php2
-rw-r--r--lib/util.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 4ea226692..9fe3c2379 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -81,6 +81,8 @@ class SearchGroupNav extends Widget
_('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people');
$this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'),
_('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
+ $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'),
+ _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_notice');
$this->action->elementEnd('ul');
}
}
diff --git a/lib/util.php b/lib/util.php
index 03d6b6199..723b2f250 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -823,6 +823,8 @@ function common_fancy_url($action, $args=null)
return common_path('settings/im');
case 'avatarsettings':
return common_path('settings/avatar');
+ case 'groupsearch':
+ return common_path('search/group' . (($args) ? ('?' . http_build_query($args)) : ''));
case 'peoplesearch':
return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
case 'noticesearch':