diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | modules/system.module | 14 | ||||
| -rw-r--r-- | modules/system/system.module | 14 | ||||
| -rw-r--r-- | modules/taxonomy.module | 2 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/modules/node.module b/modules/node.module index c228e4e72..e06d1a815 100644 --- a/modules/node.module +++ b/modules/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))); 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))); diff --git a/modules/system.module b/modules/system.module index 3e1c35ab1..a1fe0c515 100644 --- a/modules/system.module +++ b/modules/system.module @@ -37,7 +37,7 @@ function system_link($type) { function system_view_options() { global $conf, $cmodes, $corder; - + // general settings: $output .= "<h3>General settings</h3>\n"; $output .= form_textfield("Name", "site_name", variable_get("site_name", "drupal"), 55, 55, "The name of this website."); @@ -124,12 +124,12 @@ function system_view($type) { $form = system_view_filters(); break; default: - foreach (module_list() as $name) { - if (module_hook($name, "conf_options")) { - $links[] = la($name, array("mod" => "system"), $name); - } - } - + foreach (module_list() as $name) { + if (module_hook($name, "conf_options")) { + $links[] = la($name, array("mod" => "system"), $name); + } + } + $output = "<small>". implode(" :: ", $links) ."</small><hr />"; $form = system_view_options(); } diff --git a/modules/system/system.module b/modules/system/system.module index 3e1c35ab1..a1fe0c515 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -37,7 +37,7 @@ function system_link($type) { function system_view_options() { global $conf, $cmodes, $corder; - + // general settings: $output .= "<h3>General settings</h3>\n"; $output .= form_textfield("Name", "site_name", variable_get("site_name", "drupal"), 55, 55, "The name of this website."); @@ -124,12 +124,12 @@ function system_view($type) { $form = system_view_filters(); break; default: - foreach (module_list() as $name) { - if (module_hook($name, "conf_options")) { - $links[] = la($name, array("mod" => "system"), $name); - } - } - + foreach (module_list() as $name) { + if (module_hook($name, "conf_options")) { + $links[] = la($name, array("mod" => "system"), $name); + } + } + $output = "<small>". implode(" :: ", $links) ."</small><hr />"; $form = system_view_options(); } diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 5d4a7f4ee..ccccd36c4 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -56,7 +56,7 @@ function taxonomy_form_vocabulary($edit = array()) { $nodetypes[$name] = $name; } } - + $form .= form_textfield("Vocabulary name", "name", $edit["name"], 50, 64, "Required. The name for this vocabulary. Example: 'Topic'."); $form .= form_textarea("Description", "description", $edit["description"], 60, 5, "Optional. Description of the vocabulary, can be used by modules."); $form .= form_select("Types", "types", explode(",", $edit["types"]), $nodetypes, "Required. A list of node types you want to associate this vocabulary with.", "", 1); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 5d4a7f4ee..ccccd36c4 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -56,7 +56,7 @@ function taxonomy_form_vocabulary($edit = array()) { $nodetypes[$name] = $name; } } - + $form .= form_textfield("Vocabulary name", "name", $edit["name"], 50, 64, "Required. The name for this vocabulary. Example: 'Topic'."); $form .= form_textarea("Description", "description", $edit["description"], 60, 5, "Optional. Description of the vocabulary, can be used by modules."); $form .= form_select("Types", "types", explode(",", $edit["types"]), $nodetypes, "Required. A list of node types you want to associate this vocabulary with.", "", 1); |