Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.412
diff -u -p -r1.412 aggregator.module
--- modules/aggregator/aggregator.module	28 May 2009 09:30:58 -0000	1.412
+++ modules/aggregator/aggregator.module	3 Jun 2009 03:28:49 -0000
@@ -569,7 +569,7 @@ function aggregator_refresh($feed) {
  *   An object describing the feed.
  */
 function aggregator_feed_load($fid) {
-  static $feeds;
+  $feeds = &drupal_static(__FUNCTION__);
   if (!isset($feeds[$fid])) {
     $feeds[$fid] = db_query('SELECT * FROM {aggregator_feed} WHERE fid = :fid', array(':fid' => $fid))->fetchObject();
   }
@@ -586,7 +586,7 @@ function aggregator_feed_load($fid) {
  *   An associative array describing the category.
  */
 function aggregator_category_load($cid) {
-  static $categories;
+  $categories = &drupal_static(__FUNCTION__);
   if (!isset($categories[$cid])) {
     $categories[$cid] = db_query('SELECT * FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $cid))->fetchAssoc();
   }