From 6e4f0519b75034144cd6b538f64c10f0759be595 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Wed, 20 Jan 2010 13:28:30 +0300
Subject: [PATCH] update_rss_feed: remove memcache support

---
 functions.php | 73 ++++++++++++++++++++++-----------------------------
 1 file changed, 31 insertions(+), 42 deletions(-)

diff --git a/functions.php b/functions.php
index 9d51df53e..8436f2154 100644
--- a/functions.php
+++ b/functions.php
@@ -602,51 +602,40 @@
 			error_reporting(0);
 		}
 
-		$obj_id = md5("FEEDOBJ:$fetch_url");
-
-		if ($memcache && $obj = $memcache->get($obj_id)) {
-			if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
-				_debug("update_rss_feed: data found in memcache [$obj_id]");
-			}
-			$rss = $obj;
+		if (!$use_simplepie) {
+			$rss = fetch_rss($fetch_url);
 		} else {
-
-			if (!$use_simplepie) {
-				$rss = fetch_rss($fetch_url);
-			} else {
-				if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
-					mkdir(SIMPLEPIE_CACHE_DIR);
-				}
-	
-				$rss = new SimplePie();
-				$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
-	#			$rss->set_timeout(10);
-				$rss->set_feed_url($fetch_url);
-				$rss->set_output_encoding('UTF-8');
-	
-				if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
-					if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
-						_debug("enabling image cache");
-					}
-	
-					$rss->set_image_handler('./image.php', 'i');
-				}
-	
-				if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
-					_debug("feed update interval (sec): " .
-						get_feed_update_interval($link, $feed)*60);
-				}
-	
-				if (is_dir(SIMPLEPIE_CACHE_DIR)) {
-					$rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
-					$rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
-				}
-	
-				$rss->init();
+			if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
+				mkdir(SIMPLEPIE_CACHE_DIR);
 			}
-	
-			if ($rss && $memcache) $memcache->add($obj_id, $rss, MEMCACHE_COMPRESSED, 300);
+
+			$rss = new SimplePie();
+			$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
+#			$rss->set_timeout(10);
+			$rss->set_feed_url($fetch_url);
+			$rss->set_output_encoding('UTF-8');
+
+			if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
+				if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+					_debug("enabling image cache");
+				}
+
+				$rss->set_image_handler('./image.php', 'i');
+			}
+
+			if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+				_debug("feed update interval (sec): " .
+					get_feed_update_interval($link, $feed)*60);
+			}
+
+			if (is_dir(SIMPLEPIE_CACHE_DIR)) {
+				$rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
+				$rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+			}
+
+			$rss->init();
 		}
+	
 
 //		print_r($rss);