Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 5d5196efddec8fd34c03c465e76123013f03657e..b6eb02a2da1e333de70c742ccdbec0f5166d025f 100644 (file)
--- a/inc/loader/load_cache-modreg.php
+++ b/inc/loader/load_cache-modreg.php
@@ -37,6 +37,9 @@ 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"))) {
        // Load cache
@@ -73,11 +76,11 @@ if (($cacheInstance->loadCacheFile("mod_reg")) && ($cacheInstance->extensionVers
        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