diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-04-21 10:26:53 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-04-21 10:26:53 +0000 |
| commit | 8207690ac54105fc4f88eeee65a524ceeb2d35fd (patch) | |
| tree | 27db910797fbc43163d33465c17a23aafedb9c2a | |
| parent | 0d0a939ab121b5646bd7a4e22056f75d97eaa6ee (diff) | |
| download | brdo-8207690ac54105fc4f88eeee65a524ceeb2d35fd.tar.gz brdo-8207690ac54105fc4f88eeee65a524ceeb2d35fd.tar.bz2 | |
- #56617: Search ranking criteria depended on eachother.
- XHTML validation of node search form
| -rw-r--r-- | modules/node.module | 4 | ||||
| -rw-r--r-- | modules/node/node.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/node.module b/modules/node.module index c548741a2..a25643727 100644 --- a/modules/node.module +++ b/modules/node.module @@ -692,7 +692,7 @@ function node_search($op = 'search', $keys = null) { $ranking[] = '%d * (2.0 - 2.0 / (1.0 + nc.totalcount * %f))'; $arguments2[] = $weight; $arguments2[] = $scale; - $join2 .= ' LEFT JOIN {node_counter} nc ON n.nid = nc.nid'; + $join2 .= ' LEFT JOIN {node_counter} nc ON nc.nid = i.sid'; } $select2 = (count($ranking) ? implode(' + ', $ranking) : 'i.relevance') . ' AS score'; @@ -2156,7 +2156,7 @@ function node_form_alter($form_id, &$form) { '#type' => 'submit', '#value' => t('Advanced search'), '#prefix' => '<div class="action">', - '#suffix' => '</div><br clear="all" />', + '#suffix' => '</div><br class="clear" />', ); $form['#validate']['node_search_validate'] = array(); diff --git a/modules/node/node.module b/modules/node/node.module index c548741a2..a25643727 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -692,7 +692,7 @@ function node_search($op = 'search', $keys = null) { $ranking[] = '%d * (2.0 - 2.0 / (1.0 + nc.totalcount * %f))'; $arguments2[] = $weight; $arguments2[] = $scale; - $join2 .= ' LEFT JOIN {node_counter} nc ON n.nid = nc.nid'; + $join2 .= ' LEFT JOIN {node_counter} nc ON nc.nid = i.sid'; } $select2 = (count($ranking) ? implode(' + ', $ranking) : 'i.relevance') . ' AS score'; @@ -2156,7 +2156,7 @@ function node_form_alter($form_id, &$form) { '#type' => 'submit', '#value' => t('Advanced search'), '#prefix' => '<div class="action">', - '#suffix' => '</div><br clear="all" />', + '#suffix' => '</div><br class="clear" />', ); $form['#validate']['node_search_validate'] = array(); |