X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-modules.php;h=be0d09f63090ae18b92944d31600789e1818f04f;hb=d9c334d0126dfa49f2ff15a81612251dea862acb;hp=e957bc63be0d835b5842cced44972bdb131a1a2d;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index e957bc63be..be0d09f630 100644
--- a/inc/loader/load_cache-modules.php
+++ b/inc/loader/load_cache-modules.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,23 +52,29 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
 
 	// Rewrite module cache
 	$modArray = $GLOBALS['cache_array']['modules'];
+
+	// Do only process valid arrays
+	if (!isset($modArray['module'])) {
+		// We should fix this!
+		debug_report_bug(__FILE__, __LINE__, 'modArray=<pre>'.print_r($modArray, true).'</pre>');
+	} // END - if
+
+	// Rewrite some parts
 	foreach ($modArray['module'] as $key => $mod) {
-		$GLOBALS['cache_array']['modules']['id'][$mod] = $modArray['id'][$key];
-		unset($GLOBALS['cache_array']['modules']['id'][$key]);
-		$GLOBALS['cache_array']['modules']['title'][$mod] = $modArray['title'][$key];
-		unset($GLOBALS['cache_array']['modules']['title'][$key]);
-		$GLOBALS['cache_array']['modules']['locked'][$mod] = $modArray['locked'][$key];
-		unset($GLOBALS['cache_array']['modules']['locked'][$key]);
-		$GLOBALS['cache_array']['modules']['hidden'][$mod] = $modArray['hidden'][$key];
-		unset($GLOBALS['cache_array']['modules']['hidden'][$key]);
-		$GLOBALS['cache_array']['modules']['admin_only'][$mod] = $modArray['admin_only'][$key];
-		unset($GLOBALS['cache_array']['modules']['admin_only'][$key]);
-		$GLOBALS['cache_array']['modules']['mem_only'][$mod] = $modArray['mem_only'][$key];
-		unset($GLOBALS['cache_array']['modules']['mem_only'][$key]);
-		if (isset($GLOBALS['cache_array']['modules']['has_menu'][$key])) {
-			$GLOBALS['cache_array']['modules']['has_menu'][$mod] = $modArray['has_menu'][$key];
-			unset($GLOBALS['cache_array']['modules']['has_menu'][$key]);
-		} // END - if
+		// Add all
+		foreach (array('id','title','locked','hidden','admin_only','mem_only','has_menu') as $entry) {
+			// Is the entry set?
+			if (isset($GLOBALS['cache_array']['modules'][$entry][$key])) {
+				// Transfer it
+				$GLOBALS['cache_array']['modules'][$entry][$mod] = $modArray[$entry][$key];
+
+				// And delete cache
+				unset($GLOBALS['cache_array']['modules'][$entry][$key]);
+			} else {
+				// Log this for debug purposes
+				logDebugMessage(basename(__FILE__), __LINE__, 'Entry not found. module=' . $mod . ',key=' . $key . ',entry=' . $entry);
+			}
+		} // END - foreach
 	} // END - foreach
 	unset($modArray);
 } elseif (getOutputMode() != 1) {