diff options
| -rw-r--r-- | includes/database.inc | 6 | ||||
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/includes/database.inc b/includes/database.inc index 3931fda1e..fc6d9d754 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -207,10 +207,10 @@ function _db_rewrite_sql($query = '', $primary_table = 'n', $primary_field = 'ni } } - $where = empty($where) ? '' : '('. implode(') AND (',$where).')'; - $join = empty($join) ? '' : implode(' ',$join); + $where = empty($where) ? '' : '('. implode(') AND (', $where) .')'; + $join = empty($join) ? '' : implode(' ', $join); - return array($join, $where, $distinct ); + return array($join, $where, $distinct); } /** diff --git a/modules/node.module b/modules/node.module index 48cd68264..008de3dd4 100644 --- a/modules/node.module +++ b/modules/node.module @@ -590,7 +590,7 @@ function node_search($op = 'search', $keys = null) { return array('remaining' => $remaining, 'total' => $total); case 'search': list($join, $where) = _db_rewrite_sql(); - $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join .' INNER JOIN {users} u ON n.uid = u.uid', 'n.status = 1 AND '. $where); + $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join .' INNER JOIN {users} u ON n.uid = u.uid', 'n.status = 1'. (empty($where) ? '' : ' AND '. $where)); $results = array(); foreach ($find as $item) { $node = node_load(array('nid' => $item)); diff --git a/modules/node/node.module b/modules/node/node.module index 48cd68264..008de3dd4 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -590,7 +590,7 @@ function node_search($op = 'search', $keys = null) { return array('remaining' => $remaining, 'total' => $total); case 'search': list($join, $where) = _db_rewrite_sql(); - $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join .' INNER JOIN {users} u ON n.uid = u.uid', 'n.status = 1 AND '. $where); + $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join .' INNER JOIN {users} u ON n.uid = u.uid', 'n.status = 1'. (empty($where) ? '' : ' AND '. $where)); $results = array(); foreach ($find as $item) { $node = node_load(array('nid' => $item)); |