From: Roland Häder <roland@mxchange.org>
Date: Fri, 5 Dec 2008 23:58:36 +0000 (+0000)
Subject: Cache does no longer try to close non-existing cache
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=930830936f3d53fcfde60d14a408c5add6679a22;p=mailer.git

Cache does no longer try to close non-existing cache
---

diff --git a/inc/databases.php b/inc/databases.php
index 04b81d6fd0..f0865f617a 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "602");
+define('CURR_SVN_REVISION', "603");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index d5b3639477..c2b92decb9 100644
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -243,11 +243,16 @@ class mxchange_cache
 	function cache_destroy() {
 		// Is the cache file there?
 		if (FILE_READABLE($this->cache_inc)) {
+			// Close cache
+			$this->close_cache();
+
 			// Remove cache file from system
 			unlink($this->cache_inc);
+
+			// Is the file there?
 			if (!FILE_READABLE($this->cache_inc)) {
-				// Close cache automatically (we don't need it anymore!)
-				$this->cache_close();
+				// The cache does no longer exist so kill the content
+				unset($this->cache_data[$this->cache_file]);
 			} else {
 				// Not removed!
 				ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->cache_inc.CACHE_CANNOT_UNLINK_2);