From 7e38142d4aa080767617724a98c0cf60c70961d0 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Thu, 10 Jul 2008 00:51:26 -0400 Subject: Resolve conflicts and convert _t( to _( where it was introduced again. darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz --- lib/util.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/util.php') diff --git a/lib/util.php b/lib/util.php index 1af5d1177..1d661fb4e 100644 --- a/lib/util.php +++ b/lib/util.php @@ -277,7 +277,8 @@ function common_nav_menu() { common_menu_item(common_local_url('all', array('nickname' => $user->nickname)), _('Home')); } - common_menu_item(common_local_url('public'), _t('Public')); + common_menu_item(common_local_url('public'), _('Public')); + common_menu_item(common_local_url('peoplesearch'), _('Search')); common_menu_item(common_local_url('doc', array('title' => 'help')), _('Help')); if ($user) { -- cgit v1.2.3-54-g00ecf