Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.210
diff -u -p -r1.210 locale.inc
--- includes/locale.inc	2 Apr 2009 20:39:44 -0000	1.210
+++ includes/locale.inc	3 Apr 2009 05:04:55 -0000
@@ -1393,9 +1393,9 @@ function _locale_import_message($message
  *   Text group to import PO file into (eg. 'default' for interface translations)
  */
 function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL, $group = 'default') {
-  static $report = array('additions' => 0, 'updates' => 0, 'deletes' => 0, 'skips' => 0);
-  static $headerdone = FALSE;
-  static $strings = array();
+  $report = &drupal_static(__FUNCTION__, array('additions' => 0, 'updates' => 0, 'deletes' => 0, 'skips' => 0));
+  $headerdone = &drupal_static(__FUNCTION__ . 'headerdone', FALSE);
+  $strings = &drupal_static(__FUNCTION__ . 'strings', array());
 
   switch ($op) {
     // Return stored strings
@@ -2290,7 +2290,7 @@ function _locale_translate_seek() {
  * Build array out of search criteria specified in request variables
  */
 function _locale_translate_seek_query() {
-  static $query = NULL;
+  $query = &drupal_static(__FUNCTION__, NULL);
   if (!isset($query)) {
     $query = array();
     $fields = array('string', 'language', 'translation', 'group');