From aa1d1076b9115580ea07374b9c470f5a0c40ca07 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 15 Feb 2010 04:51:14 +0000
Subject: [PATCH] Method extensionVersionMatches() is now cached in

---
 inc/classes/cachesystem.class.php | 45 ++++++++++++++++---------------
 inc/loader/load_cache-modules.php |  2 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index f160a6cfdb..ae127dc27e 100644
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -436,32 +436,35 @@ class CacheSystem {
 
 	// Checks wether versions from cache and extension matches
 	function extensionVersionMatches ($ext_name) {
-		// Default is not matching
-		$matches = false;
-
-		// Compare only if installed
-		if (isExtensionInstalled($ext_name)) {
-			// Get extension version
-			$ext_ver = getExtensionVersion($ext_name);
-
-			// Debug messages
-			if (isset($this->version[$this->name][$ext_name])) {
-				// Does it match?
-				$matches = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver));
-			} elseif ($this->isCacheReadable()) {
-				// No cache version found!
-				logDebugMessage(__METHOD__, __LINE__, "Cache {$this->name} has missing version entry for extension {$ext_name}! Purging cache...");
-
-				// Remove the cache file
-				$this->removeCacheFile(true);
+		// Check cache
+		if (!isset($GLOBALS[__METHOD__][$ext_name])) {
+			// Compare only if installed
+			if (isExtensionInstalled($ext_name)) {
+				// Get extension version
+				$ext_ver = getExtensionVersion($ext_name);
+
+				// Debug messages
+				if (isset($this->version[$this->name][$ext_name])) {
+					// Does it match?
+					$GLOBALS[__METHOD__][$ext_name] = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver));
+				} elseif ($this->isCacheReadable()) {
+					// No cache version found!
+					logDebugMessage(__METHOD__, __LINE__, "Cache {$this->name} has missing version entry for extension {$ext_name}! Purging cache...");
+	
+					// Remove the cache file
+					$this->removeCacheFile(true);
+				}
+			} else {
+				// Not installed, does always match
+				$GLOBALS[__METHOD__][$ext_name] = true;
 			}
 		} else {
-			// Not installed, does always match
-			$matches = true;
+			// Cache entry found, log debug message
+			//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'ext_name=' . $ext_name . ', matches=' . intval($GLOBALS[__METHOD__][$ext_name]));
 		}
 
 		// Compare both
-		return $matches;
+		return $GLOBALS[__METHOD__][$ext_name];
 	}
 
 	// Rewrit the entry so it can be stored in cache file
diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index 052d9937dd..c0caef79c5 100644
--- a/inc/loader/load_cache-modules.php
+++ b/inc/loader/load_cache-modules.php
@@ -64,7 +64,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
 				unset($GLOBALS['cache_array']['modules'][$entry][$key]);
 			} else {
 				// Log this for debug purposes
-				debugLogMessage('[' . basename(__FILE__) . ':' . __LINE__ . '] Entry not found. module=' . $mod . ',key=' . $key . ',entry=' . $entry);
+				logDebugMessage(basename(__FILE__), __LINE__, 'Entry not found. module=' . $mod . ',key=' . $key . ',entry=' . $entry);
 			}
 		} // END - foreach
 	} // END - foreach
-- 
2.39.5