Index: modules/update/update.compare.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.compare.inc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 update.compare.inc
--- modules/update/update.compare.inc	17 Jan 2008 12:03:21 -0000	1.4
+++ modules/update/update.compare.inc	21 Jan 2008 20:09:59 -0000
@@ -23,8 +23,15 @@
 function update_get_projects() {
   static $projects = array();
   if (empty($projects)) {
-    _update_process_info_list($projects, module_rebuild_cache(), 'module');
-    _update_process_info_list($projects, system_theme_data(), 'theme');
+    // Retrieve the projects from cache, if present.
+    $projects = update_project_cache('update_project_projects');
+    if (empty($projects)) {
+      // Still empty, so we have to rebuild the cache.
+      _update_process_info_list($projects, module_rebuild_cache(), 'module');
+      _update_process_info_list($projects, system_theme_data(), 'theme');
+      // Set the projects array into the cache table.
+      cache_set('update_project_projects', $projects, 'cache_update', time() + 3600);  
+    }
   }
   return $projects;
 }
@@ -233,6 +240,13 @@ function update_process_project_info(&$p
  * @see update_process_project_info()
  */
 function update_calculate_project_data($available) {
+  // Retrieve the projects from cache, if present.
+  $projects = update_project_cache('update_project_data');
+  // If $projects is empty, then the cache must be rebuilt.
+  // Otherwise, just return the cached data and skip the rest of the function.
+  if (!empty($projects)) {
+    return $projects;
+  }  
   $projects = update_get_projects();
   update_process_project_info($projects);
   foreach ($projects as $project => $project_info) {
@@ -543,5 +557,38 @@ function update_calculate_project_data($
   // contrib module to provide fine-grained settings to ignore specific
   // projects or releases).
   drupal_alter('update_status', $projects);
+
+  // Set the projects array into the cache table.
+  cache_set('update_project_data', $projects, 'cache_update', time() + 3600);
+
+  return $projects;
+}
+
+/**
+ * Retrieve the project data from the {cache_update} table and empty
+ * the cache when necessary.
+ * @param $cid
+ * The class of data to return from the cache.  Valid options are
+ * 'update_project_data' and 'update_project_projects'.
+ * @return
+ * The $projects array generated by update_calculate_project_data() or update_get_projects() 
+ * and stored in the {cache_update} table. Returns an empty array
+ * when the cache is cleared.
+ */
+function update_project_cache($cid) {
+  $projects = array();
+  // In some cases, we must clear the cache.  Rather than do so on a time
+  // basis, we check for specific paths.
+  $q = $_GET['q'];
+  $paths = array('admin/build/modules', 'admin/build/themes', 'admin/reports', 'admin/reports/updates', 'admin/reports/status', 'admin/reports/updates/check');
+  if (in_array($q, $paths)) {
+    cache_clear_all($cid, 'cache_update');
+  }
+  else {
+    $cache = cache_get($cid, 'cache_update');
+    if (!empty($cache->data)) {
+      $projects = $cache->data;
+    }  
+  }  
   return $projects;
 }