Merge branch 'locshunt' into 0.9.x

[quix0rs-gnu-social.git] / actions / groupsearch.php

diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index ee4167552a467c8019feaf8fcc2359bc1cab0703..55f4cee625e37b5265ea40ef490945ceceb021da 100644 (file)
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -90,6 +90,12 @@ class GroupsearchAction extends SearchAction
             $user_group->free();
         }
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('q');
+    }
 }
 
 class GroupSearchResults extends GroupList
@@ -99,7 +105,7 @@ class GroupSearchResults extends GroupList
 
     function __construct($user_group, $terms, $action)
     {
-        parent::__construct($user_group, $terms, $action);
+        parent::__construct($user_group, null, $action);
         $this->terms = array_map('preg_quote',
                                  array_map('htmlspecialchars', $terms));
         $this->pattern = '/('.implode('|',$terms).')/i';