All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

[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 fd3b2a39825b291d9c82fa9191d5f461d8ffc8c3..0b453f1b4bfa16b697f7e2c42ef028ca48b6a10c 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -40,6 +40,9 @@ 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"))) {
        // Load referal system from cache
@@ -72,9 +75,9 @@ if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersi
 
        // 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
@@ -88,7 +91,7 @@ if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersi
        $cacheInstance->finalize();
 
        // Reload the cache
-       require(__FILE__);
+       LOAD_INC(__FILE__);
 }
 
 //