From f3c875717910918574aa1310de176e0c44062199 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 20 May 2002 07:34:38 +0000 Subject: - Ran the code through 'scripts/code-clean.sh': removed trailing whitespace (and possibly tabs). --- modules/node/node.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/node/node.module') diff --git a/modules/node/node.module b/modules/node/node.module index c228e4e72..e06d1a815 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1227,7 +1227,7 @@ function node_page() { if ($or) { // this is an OR of terms $result = db_query("SELECT DISTINCT(n.nid), type FROM node n LEFT JOIN term_node r ON n.nid = r.nid WHERE tid IN (".implode(",", $terms).") AND ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); - } + } else if ($and) { // this is an AND $result = db_query("SELECT n.nid, type, count(*) AS c FROM node n LEFT JOIN term_node r ON n.nid = r.nid WHERE tid IN (".implode(",", $terms).") AND ". ($id ? "nid = '$id'" : "promote = '1'") ." AND status = '1' GROUP BY n.nid HAVING c = ".count($terms)." ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); -- cgit v1.2.3