Fixes for cache/theme
authorRoland Häder <roland@mxchange.org>
Wed, 17 Dec 2008 22:16:06 +0000 (22:16 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 17 Dec 2008 22:16:06 +0000 (22:16 +0000)
inc/databases.php
inc/extensions/ext-sql_patches.php
inc/loader/load_cache-them.php

index 64c8353..a61c098 100644 (file)
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "646");
+define('CURR_SVN_REVISION', "647");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
index 92b8b05..e350aca 100644 (file)
@@ -716,10 +716,14 @@ default: // Do stuff when extension is loaded
 
                // Read key from secret file
                if ((getConfig('file_hash') == "") || (getConfig('master_salt') == "") || (getConfig('pass_scramble') == "")) {
+                       // Cache instance
+                       global $cacheInstance;
+
                        // Maybe need setup of secret key!
                        require_once(PATH."inc/gen_sql_patches.php");
 
-                       if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_object($cacheInstance))) {
+                       // @TODO Rewrite this to a filter!
+                       if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheInstance)) && (is_object($cacheInstance))) {
                                // Remove extensions and mod_reg cache file
                                require_once(PATH."inc/libs/cache_functions.php");
                                require_once(PATH."inc/extensions/ext-cache.php");
index f8d70df..fd3b2a3 100644 (file)
@@ -35,6 +35,9 @@
 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;
 }
 
 // Next cached table is the referal system (themes)...