From 2141a64e341b9880b7b32ec7456554170dd21ec6 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 11 Aug 2010 14:21:39 +0000
Subject: - Patch #497206 by jhodgdon, pwolanin, Island Usurper, YannickD:
 avoid search conflicts with other forms, use menu API instead of
 search_get_keys().

---
 modules/user/user.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/user/user.module')

diff --git a/modules/user/user.module b/modules/user/user.module
index a21097758..344227fcf 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -871,7 +871,7 @@ function user_search_access() {
 /**
  * Implements hook_search_execute().
  */
-function user_search_execute($keys = NULL) {
+function user_search_execute($keys = NULL, $conditions = NULL) {
   $find = array();
   // Replace wildcards with MySQL/PostgreSQL wildcards.
   $keys = preg_replace('!\*+!', '%', $keys);
-- 
cgit v1.2.3