diff --git a/wp-content/plugins/google-hilite.php b/wp-content/plugins/google-hilite.php
index b179159808..b87c7eff21 100644
--- a/wp-content/plugins/google-hilite.php
+++ b/wp-content/plugins/google-hilite.php
@@ -10,7 +10,9 @@ Author URI: http://rboren.nu
 
 /* Highlighting code c/o Ryan Boren */
 function get_search_query_terms($engine = 'google') {
-    global $s, $s_array;
+	$search = get_query_var('s');
+	$search_terms = get_query_var('search_terms');
+
 	$referer = urldecode($_SERVER['HTTP_REFERER']);
 	$query_array = array();
 	switch ($engine) {
@@ -38,10 +40,10 @@ function get_search_query_terms($engine = 'google') {
         // Check the search form vars if the search terms
         // aren't in the referer.
         if ( ! preg_match('/^.*s=/i', $referer)) {
-            if (isset($s_array)) {
-                $query_array = $s_array;
-            } else if (isset($s)) {
-                $query_array = array($s);
+            if (!empty($search_terms)) {
+                $query_array = $search_terms;
+            } else if (isset($search)) {
+                $query_array = array($search);
             }
 
             break;
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 0944e01e0c..83b154efa0 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -297,6 +297,7 @@ class WP_Query {
 			}
 			if (!$q['sentence']) {
 				$s_array = explode(' ',$q['s']);
+				$q['search_terms'] = $s_array;
 				$search .= '((post_title LIKE \''.$n.$s_array[0].$n.'\') OR (post_content LIKE \''.$n.$s_array[0].$n.'\'))';
 				for ( $i = 1; $i < count($s_array); $i = $i + 1) {
 					$search .= ' AND ((post_title LIKE \''.$n.$s_array[$i].$n.'\') OR (post_content LIKE \''.$n.$s_array[$i].$n.'\'))';