Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.301
diff -u -p -r1.301 search.module
--- modules/search/search.module	5 Jul 2009 18:00:10 -0000	1.301
+++ modules/search/search.module	9 Jul 2009 18:55:04 -0000
@@ -263,7 +263,7 @@ function search_wipe($sid = NULL, $type 
  * the search_total table, and need to be recounted.
  */
 function search_dirty($word = NULL) {
-  static $dirty = array();
+  $dirty = &drupal_static(__FUNCTION__, array());
   if ($word !== NULL) {
     $dirty[$word] = TRUE;
   }
@@ -379,8 +379,8 @@ function search_expand_cjk($matches) {
  * Splits a string into tokens for indexing.
  */
 function search_index_split($text) {
-  static $last = NULL;
-  static $lastsplit = NULL;
+  $last = &drupal_static(__FUNCTION__);
+  $lastsplit = &drupal_static(__FUNCTION__ . ':lastsplit');
 
   if ($last == $text) {
     return $lastsplit;
@@ -1003,7 +1003,7 @@ function do_search($keywords, $type, $jo
  * Helper function for grabbing search keys.
  */
 function search_get_keys() {
-  static $return;
+  $return = &drupal_static(__FUNCTION__);
   if (!isset($return)) {
     // Extract keys as remainder of path
     // Note: support old GET format of searches for existing links.