Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

diff --combined htaccess.sample
index 73b52c55e1e80b357e02897b0a7026cb3a2fa03c,d94652bfd13187f719380c908e0754dedf934c2a..5f9827f9630f64f56ddbedf9008c522e5097b92f
--- 1/htaccess.sample
--- 2/htaccess.sample
+++ b/htaccess.sample
@@@ -65,6 -65,7 +65,7 @@@ RewriteRule ^settings/sms$ index.php?ac
  RewriteRule ^settings/twitter$ index.php?action=twittersettings [L,QSA]
  RewriteRule ^settings/other$ index.php?action=othersettings [L,QSA]
  
+ RewriteRule ^search/group$ index.php?action=groupsearch [L,QSA]
  RewriteRule ^search/people$ index.php?action=peoplesearch [L,QSA]
  RewriteRule ^search/notice$ index.php?action=noticesearch [L,QSA]
  RewriteRule ^search/notice/rss$ index.php?action=noticesearchrss [L,QSA]
@@@ -88,14 -89,13 +89,14 @@@ RewriteRule ^peopletag/([a-zA-Z0-9]+)$ 
  RewriteRule ^featured/?$ index.php?action=featured [L,QSA]
  RewriteRule ^favorited/?$ index.php?action=favorited [L,QSA]
  
 -RewriteRule ^group/new index.php?action=newgroup [L,QSA]
 -RewriteRule ^group/([a-zA-Z0-9]+)/edit index.php?action=editgroup&nickname=$1 [L,QSA]
 -RewriteRule ^group/([a-zA-Z0-9]+)/join index.php?action=joingroup&nickname=$1 [L,QSA]
 -RewriteRule ^group/([a-zA-Z0-9]+)/leave index.php?action=leavegroup&nickname=$1 [L,QSA]
 -RewriteRule ^group/([a-zA-Z0-9]+)/members index.php?action=groupmembers&nickname=$1 [L,QSA]
 -RewriteRule ^group/([0-9]+)/id index.php?action=groupbyid&id=$1 [L,QSA]
 -RewriteRule ^group/([a-zA-Z0-9]+)/rss index.php?action=grouprss&nickname=$1 [L,QSA]
 +RewriteRule ^group/new$ index.php?action=newgroup [L,QSA]
 +RewriteRule ^group/([a-zA-Z0-9]+)/edit$ index.php?action=editgroup&nickname=$1 [L,QSA]
 +RewriteRule ^group/([a-zA-Z0-9]+)/join$ index.php?action=joingroup&nickname=$1 [L,QSA]
 +RewriteRule ^group/([a-zA-Z0-9]+)/leave$ index.php?action=leavegroup&nickname=$1 [L,QSA]
 +RewriteRule ^group/([a-zA-Z0-9]+)/members$ index.php?action=groupmembers&nickname=$1 [L,QSA]
 +RewriteRule ^group/([a-zA-Z0-9]+)/logo$ index.php?action=grouplogo&nickname=$1 [L,QSA]
 +RewriteRule ^group/([0-9]+)/id$ index.php?action=groupbyid&id=$1 [L,QSA]
 +RewriteRule ^group/([a-zA-Z0-9]+)/rss$ index.php?action=grouprss&nickname=$1 [L,QSA]
  RewriteRule ^group/([a-zA-Z0-9]+)$ index.php?action=showgroup&nickname=$1 [L,QSA]
  RewriteRule ^group$ index.php?action=groups [L,QSA]
  

diff --combined lib/util.php
index 03d6b61996ce5a094926b41a5d5fcb7725270120,4b77f7c19c7716eb34f1318c9db3c2a9ef6ae8e8..723b2f250482c0328e21d026f465b5be1606fad1
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -823,6 -823,8 +823,8 @@@ function common_fancy_url($action, $arg
          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':
@@@ -898,8 -900,6 +900,8 @@@
          return common_path('group/'.$args['nickname'].'/rss');
       case 'groupmembers':
          return common_path('group/'.$args['nickname'].'/members');
 +     case 'grouplogo':
 +        return common_path('group/'.$args['nickname'].'/logo');
       case 'usergroups':
          return common_path($args['nickname'].'/groups');
       case 'groups':