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/node | |
| 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/node')
| -rw-r--r-- | modules/node/node.module | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index c234b4b41..22d319b1e 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1539,7 +1539,7 @@ function node_search_admin() { /** * Implements hook_search_execute(). */ -function node_search_execute($keys = NULL) { +function node_search_execute($keys = NULL, $conditions = NULL) { // Build matching conditions $query = db_select('search_index', 'i', array('target' => 'slave'))->extend('SearchQuery')->extend('PagerDefault'); $query->join('node', 'n', 'n.nid = i.sid'); |