diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-08-11 14:21:39 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-08-11 14:21:39 +0000 |
| commit | 2141a64e341b9880b7b32ec7456554170dd21ec6 (patch) | |
| tree | 42cd00c4e840821295247198452b4f55931f4d88 /modules/user/user.module | |
| parent | 5fcf1eda32adf4851b40360bc8df1157bbdeea54 (diff) | |
| download | brdo-2141a64e341b9880b7b32ec7456554170dd21ec6.tar.gz brdo-2141a64e341b9880b7b32ec7456554170dd21ec6.tar.bz2 | |
- Patch #497206 by jhodgdon, pwolanin, Island Usurper, YannickD: avoid search conflicts with other forms, use menu API instead of search_get_keys().
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 2 |
1 files changed, 1 insertions, 1 deletions
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); |