X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-them.php;h=76faa9653a82e3b3bc4cc7985ed5cfbcc77ddec7;hp=f8d70df07d622142dbc0b3f23478f1fcc8f591f0;hb=09f5758c42a33a56bdd461c946ffe759a59c54aa;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php index f8d70df07d..76faa9653a 100644 --- a/inc/loader/load_cache-them.php +++ b/inc/loader/load_cache-them.php @@ -1,7 +1,7 @@ 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(); - foreach ($cache as $key => $data) { - // Skip "theme_path" because we don't need to rebuild it - if ($key == "theme_path") { + $GLOBALS['cache_array']['themes'] = array(); + foreach ($cache as $key => $content) { + // 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; + foreach ($content as $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; + foreach ($content as $id => $entry) { + $GLOBALS['cache_array']['themes'][$key][$cache['theme_path'][$id]] = $entry; } // END - foreach } - } // END - if + } // END - foreach // Remove dummy array unset($cache); -} elseif ((getConfig('cache_themes') == "Y") && ($CSS != "1") && ($CSS != "-1")) { +} elseif (getOutputMode() != 1) { // Create cache file here - $cacheInstance->init("THEMES"); - $cacheInstance->storeExtensionVersion("theme"); + $GLOBALS['cache_instance']->init(); // 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__); + if (getExtensionVersion('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__); } 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)) { + while ($content = SQL_FETCHARRAY($result)) { // Add row to cache file - $cacheInstance->addRow($data); + $GLOBALS['cache_instance']->addRow($content); } // END - while // Free memory SQL_FREERESULT($result); // Close the cache - $cacheInstance->finalize(); - - // Reload the cache - require(__FILE__); + $GLOBALS['cache_instance']->storeExtensionVersion('theme'); + $GLOBALS['cache_instance']->finalize(); } -// +// [EOF] ?>