X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-them.php;h=fcfd809967a2d8bc93a2f9b3b3d4faf1fee2bba6;hb=6eae8cae327a4d2257b3d3dcdfd12eba7c016fea;hp=18781a48e4174dd85647480e1410a434130f80bb;hpb=cca98f57dff720b174d21d071cee8303462485d7;p=mailer.git

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index 18781a48e4..fcfd809967 100644
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -40,58 +40,54 @@ if (!defined('__SECURITY')) {
 	return false;
 }
 
-// Make cacheInstance global
-global $cacheInstance;
-
 // Next cached table is the referal system (themes)...
-if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersionMatches("theme"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("themes")) && ($GLOBALS['cache_instance']->extensionVersionMatches("theme"))) {
 	// Load referal system from cache
-	global $cacheArray;
-	$cache = $cacheInstance->getArrayFromCache();
+	$cache = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Restructure the array
-	$cacheArray['themes'] = array();
+	$GLOBALS['cache_array']['themes'] = array();
 	foreach ($cache as $key => $data) {
 		// Skip "theme_path" because we don't need to rebuild it
 		if ($key == "theme_path") {
 			// Add entries with id
 			foreach ($data as $id => $entry) {
-				$cacheArray['themes']['theme_path'][$cache['id'][$id]] = $entry;
+				$GLOBALS['cache_array']['themes']['theme_path'][$cache['id'][$id]] = $entry;
 			} // END - foreach
 		} else {
 			// Add all themes with theme name as array index
 			foreach ($data as $id => $entry) {
-				$cacheArray['themes'][$key][$cache['theme_path'][$id]] = $entry;
+				$GLOBALS['cache_array']['themes'][$key][$cache['theme_path'][$id]] = $entry;
 			} // END - foreach
 		}
 	} // END - if
 
 	// Remove dummy array
 	unset($cache);
-} elseif ((getConfig('cache_themes') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_themes') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 	// Create cache file here
-	$cacheInstance->init("THEMES");
-	$cacheInstance->storeExtensionVersion("theme");
+	$GLOBALS['cache_instance']->init("THEMES");
+	$GLOBALS['cache_instance']->storeExtensionVersion("theme");
 
 	// Load all themes and their data
 	if (GET_EXT_VERSION("theme") >= "0.0.7") {
-		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!MYSQL_PREFIX!}_themes` ORDER BY id", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);
 	} else {
-		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM `{!MYSQL_PREFIX!}_themes` ORDER BY id", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);
 	}
 	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__);
 }
 
 //