Naming convention applied, rewritten to use filter

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

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index 9f09a159f443921929949bb0ee916f53682dfa53..673d82693c9d8a9d11ee7c89f62113295ceb5db5 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -35,8 +35,14 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
+} elseif (!EXT_IS_ACTIVE("theme")) {
+       // Skip this loader
+       return false;
 }
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Next cached table is the referal system (themes)...
 if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersionMatches("theme"))) {
        // Load referal system from cache
@@ -62,7 +68,7 @@ if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersi
 
        // Remove dummy array
        unset($cache);
-} elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_themes') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->init("THEMES");
        $cacheInstance->storeExtensionVersion("theme");