- #56617: Search ranking criteria depended on eachother.

- XHTML validation of node search form

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();

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();