=== modified file 'modules/node/node.module'
--- modules/node/node.module	2008-11-03 05:55:55 +0000
+++ modules/node/node.module	2008-11-08 15:48:21 +0000
@@ -1333,13 +1333,13 @@ function node_search($op = 'search', $ke
         $total = 1;
         $arguments2 = array();
         $join2 = '';
-        $select2 = 'i.relevance AS score';
+        $select2 = 'i.relevance AS score_result';
       }
       else {
         $total = $rankings['total'];
         $arguments2 = $rankings['arguments'];
         $join2 = implode(' ', $rankings['join']);
-        $select2 = '('. implode(' + ', $rankings['score']) .') AS score';
+        $select2 = '('. implode(' + ', $rankings['score']) .') AS score_result';
       }
 
       // Do search.
@@ -1369,7 +1369,7 @@ function node_search($op = 'search', $ke
           'date' => $node->changed,
           'node' => $node,
           'extra' => $extra,
-          'score' => $total ? ($item->score / $total) : 0,
+          'score' => $total ? ($item->score_result / $total) : 0,
           'snippet' => search_excerpt($keys, $node->body),
         );
       }

=== modified file 'modules/search/search.module'
--- modules/search/search.module	2008-11-08 04:55:13 +0000
+++ modules/search/search.module	2008-11-08 15:35:59 +0000
@@ -903,8 +903,8 @@ function _search_parse_query(&$word, &$s
  *
  * @param $columns2
  *   (optional) Inserted into the SELECT pat of the second query. Must contain
- *   a column selected as 'score'.
- *   defaults to 'i.relevance AS score'
+ *   a column selected as 'score_result'.
+ *   defaults to 'i.relevance AS score_result'
  *
  * @param $join2
  *   (optional) Inserted into the JOIN par of the second SQL query.
@@ -915,14 +915,14 @@ function _search_parse_query(&$word, &$s
  *
  * @param $sort_parameters
  *   (optional) SQL arguments for sorting the final results.
- *              Default: 'ORDER BY score DESC'
+ *              Default: 'ORDER BY score_result DESC'
  *
  * @return
  *   An array of SIDs for the search results.
  *
  * @ingroup search
  */
-function do_search($keywords, $type, $join1 = '', $where1 = '1 = 1', $arguments1 = array(), $columns2 = 'i.relevance AS score', $join2 = '', $arguments2 = array(), $sort_parameters = 'ORDER BY score DESC') {
+function do_search($keywords, $type, $join1 = '', $where1 = '1 = 1', $arguments1 = array(), $columns2 = 'i.relevance AS score_result', $join2 = '', $arguments2 = array(), $sort_parameters = 'ORDER BY score_result DESC') {
   $query = search_parse_query($keywords);
 
   if ($query[2] == '') {
@@ -948,7 +948,7 @@ function do_search($keywords, $type, $jo
   }
 
   // Calculate maximum keyword relevance, to normalize it.
-  $select = "SELECT SUM(i.score * t.count) AS calculated_score FROM {search_index} i $join WHERE $conditions GROUP BY i.type, i.sid HAVING COUNT(*) >= %d ORDER BY calculated_score DESC";
+  $select = "SELECT SUM(i.score * t.count) AS score_result FROM {search_index} i $join WHERE $conditions GROUP BY i.type, i.sid HAVING COUNT(*) >= %d ORDER BY score_result DESC";
   $arguments = array_merge($arguments1, array($query[4]));
   $normalize = db_result(db_query_range($select, $arguments, 0, 1));
   if (!$normalize) {

=== modified file 'modules/search/search.test'
--- modules/search/search.test	2008-09-17 07:11:50 +0000
+++ modules/search/search.test	2008-11-08 15:49:25 +0000
@@ -148,7 +148,7 @@ class SearchMatchTestCase extends Drupal
     // Get result scores.
     $scores = array();
     foreach ($set as $item) {
-      $scores[] = $item->score;
+      $scores[] = $item->score_result;
     }
 
     // Check order.