X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-modreg.php;h=0ff8842588a00683426f011fca881347e9296cdd;hp=4b5624dec1c5bd168adf0551085833da1abf00d9;hb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a;hpb=323f6a7c78424b654b62b69eeb44995908a5327e

diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 4b5624dec1..0ff8842588 100644
--- a/inc/loader/load_cache-modreg.php
+++ b/inc/loader/load_cache-modreg.php
@@ -37,66 +37,62 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-// Make cacheInstance global
-global $cacheInstance;
-
 // Next cached table is the module registry (mod_reg)...
-if (($cacheInstance->loadCacheFile("mod_reg")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("modreg")) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
 	// Load cache
-	global $cacheArray;
-	$cacheArray['modules'] = $cacheInstance->getArrayFromCache();
+	$GLOBALS['cache_array']['modules'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Rewrite module cache
-	$modArray = $cacheArray['modules'];
+	$modArray = $GLOBALS['cache_array']['modules'];
 	foreach ($modArray['module'] as $key => $mod) {
-		$cacheArray['modules']['id'][$mod] = $modArray['id'][$key];
-		unset($cacheArray['modules']['id'][$key]);
-		$cacheArray['modules']['title'][$mod] = $modArray['title'][$key];
-		unset($cacheArray['modules']['title'][$key]);
-		$cacheArray['modules']['locked'][$mod] = $modArray['locked'][$key];
-		unset($cacheArray['modules']['locked'][$key]);
-		$cacheArray['modules']['hidden'][$mod] = $modArray['hidden'][$key];
-		unset($cacheArray['modules']['hidden'][$key]);
-		$cacheArray['modules']['admin_only'][$mod] = $modArray['admin_only'][$key];
-		unset($cacheArray['modules']['admin_only'][$key]);
-		$cacheArray['modules']['mem_only'][$mod] = $modArray['mem_only'][$key];
-		unset($cacheArray['modules']['mem_only'][$key]);
-		if (isset($cacheArray['modules']['has_menu'][$key])) {
-			$cacheArray['modules']['has_menu'][$mod] = $modArray['has_menu'][$key];
-			unset($cacheArray['modules']['has_menu'][$key]);
+		$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
 	} // END - foreach
 	unset($modArray);
-} elseif ((getConfig('cache_modreg') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_modreg') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 	// Create cache file here
-	$cacheInstance->init("MODULES");
-	$cacheInstance->storeExtensionVersion("sql_patches");
+	$GLOBALS['cache_instance']->init("MODULES");
+	$GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
 
 	// Load all modules and their data
 	if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
 		// Load has_menu
 		$result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu
-FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`", __FILE__, __LINE__);
 	} else {
 		// Don't load has_menu
 		$result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only
-FROM "._MYSQL_PREFIX."_mod_reg ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`", __FILE__, __LINE__);
 	}
 
 	// Cache all data
 	while ($data = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
-		$cacheInstance->addRow($data);
+		$GLOBALS['cache_instance']->addRow($data);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Close the cache
-	$cacheInstance->finalize();
+	$GLOBALS['cache_instance']->finalize();
 
 	// Reload the cache
-	require(__FILE__);
+	LOAD_INC(__FILE__);
 }
 
 //