Method extensionVersionMatches() is now cached in

[mailer.git] / inc / loader / load_cache-modules.php

diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index 9058039183cba2c02feaca55974541e8dc4a3eb5..c0caef79c51e80de0023bef69ed49722930d5d29 100644 (file)
--- a/inc/loader/load_cache-modules.php
+++ b/inc/loader/load_cache-modules.php
@@ -53,22 +53,20 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
        // Rewrite module cache
        $modArray = $GLOBALS['cache_array']['modules'];
        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) {