Index: simplefeed.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplefeed/simplefeed.module,v
retrieving revision 1.46.2.8
diff -u -r1.46.2.8 simplefeed.module
--- simplefeed.module	2 Jul 2008 20:05:47 -0000	1.46.2.8
+++ simplefeed.module	11 Aug 2008 22:53:28 -0000
@@ -357,10 +357,6 @@
  * Refresh a feed, downloading any new feed items and creating nodes for them.
  */
 function simplefeed_feed_refresh($nid = NULL) {
-	// build cache path
-  $cache_path = file_create_path('cache_simplefeed');
-  file_check_directory($cache_path, FILE_CREATE_DIRECTORY);
-
   // initialize simplepie
   // we want to do this only once and not each time per feed, which would be slower
   include_once './'. drupal_get_path('module', 'simplefeed') .'/simplepie.inc';
@@ -379,11 +375,11 @@
     }
     // process each feed
     while ($process_feed = db_fetch_object($process_feeds)) {
-      simplefeed_feed_process($process_feed->nid, $cache_path);
+      simplefeed_feed_process($process_feed->nid);
     }
   }
   else if (is_numeric($nid)) {
-    simplefeed_feed_process($nid, $cache_path);
+    simplefeed_feed_process($nid);
     drupal_set_message(t('Feed refreshed.'));
     drupal_goto('node/'. $nid);
   }
@@ -402,22 +398,11 @@
  * @param $cache_path
  *   Where to store the SimplePie local cache.
  */
-function simplefeed_feed_process($nid, $cache_path) {
+function simplefeed_feed_process($nid) {
   $process_feed = node_load($nid);
 
   $feed = new SimplePie();
-  /*
-    You tell SimplePie what feed you want to get and where to cache it at.
-    SimplePie looks to see if the feed is already cached:
-      If the cache is fresh use that.
-      If there is no cached copy at all, SimplePie will grab and cache the feed.
-      If the cache is there but it's old (SimplePie defaults to 60 minutes; configurable with set_cache_duration()), then SimplePie will ask the feed if it has changed since the last time we grabbed it (this is the HTTPCG part).
-        If it hasn't changed, we reset the timer on the cache's freshness and keep it for another 60 minutes before checking again.
-        If the cache has changed, SimplePie dumps the existing cache (since the cache is just a copy of the feed), and grabs a new copy of the feed and uses it.
-
-    This cache uses a combination of LAST-MODIFIED and ETAG headers, and other intelligent methods to only grab changed feeds.
-  */
-  $feed->set_cache_location($cache_path);
+  $feed->enable_cache(FALSE);
   $feed->set_timeout(15);
   // prevent SimplePie from using all of it's data santization since we use Drupal's input formats to handle this
   $feed->set_stupidly_fast(TRUE);