move feeds cache directory to cache/feeds

diff --git a/cache/feeds/.empty b/cache/feeds/.empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/classes/rssutils.php b/classes/rssutils.php
index b6a00d309ccfd6ac6ad395b5838ef6cbac8c505c..c9e6bc0ea156462f4038465c42a61df5430154c8 100644 (file)
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -369,7 +369,7 @@ class RSSUtils {
 
                $date_feed_processed = date('Y-m-d H:i');
 
-               $cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".xml";
+               $cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
 
                $pluginhost = new PluginHost();
                $pluginhost->set_debug($debug_enabled);
@@ -454,7 +454,7 @@ class RSSUtils {
                        }
 
                        // cache vanilla feed data for re-use
-                       if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) {
+                       if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
                                $new_rss_hash = sha1($feed_data);
 
                                if ($new_rss_hash != $rss_hash) {
@@ -1288,7 +1288,7 @@ class RSSUtils {
        }
 
        static function expire_cached_files($debug) {
-               foreach (array("simplepie", "images", "export", "upload") as $dir) {
+               foreach (array("simplepie", "feeds", "images", "export", "upload") as $dir) {
                        $cache_dir = CACHE_DIR . "/$dir";
 
 //                     if ($debug) _debug("Expiring $cache_dir");