* bring back cache-busting for feed icons based on timestamp

 * DiskCache: use singleton pattern to create less cache object instances
 * DiskCache: implement ETag

2 files changed, 3 insertions, 3 deletions

diff --git a/plugins/af_comics/filters/af_comics_gocomics_farside.php b/plugins/af_comics/filters/af_comics_gocomics_farside.php
index e4e230516..e2951eb36 100644
--- a/plugins/af_comics/filters/af_comics_gocomics_farside.php
+++ b/plugins/af_comics/filters/af_comics_gocomics_farside.php
@@ -50,7 +50,7 @@ class Af_Comics_Gocomics_FarSide extends Af_ComicFilter {
 					if ($content_node) {
 						$imgs = $xpath->query('//img[@data-src]', $content_node);
 
-						$cache = new DiskCache("images");
+						$cache = DiskCache::instance("images");
 
 						foreach ($imgs as $img) {
 							$image_url = $img->getAttribute('data-src');
diff --git a/plugins/cache_starred_images/init.php b/plugins/cache_starred_images/init.php
index daaab2dca..208eafde9 100755
--- a/plugins/cache_starred_images/init.php
+++ b/plugins/cache_starred_images/init.php
@@ -21,8 +21,8 @@ class Cache_Starred_Images extends Plugin {
 
 	function init($host) {
 		$this->host = $host;
-		$this->cache = new DiskCache("starred-images");
-		$this->cache_status = new DiskCache("starred-images.status-files");
+		$this->cache = DiskCache::instance("starred-images");
+		$this->cache_status = DiskCache::instance("starred-images.status-files");
 
 		if ($this->cache->make_dir())
 			chmod($this->cache->get_dir(), 0777);