Fixes for cache/theme

diff --git a/inc/databases.php b/inc/databases.php
index 64c835393c55e40fc8422a592403129dbb0447b0..a61c098d5cafd2b203794529078b0e5aeec01187 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -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);

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 92b8b05ed591d3391497f9017b5c923c263becb0..e350aca173be2fa041b3802e9423842516c83301 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -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");

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index f8d70df07d622142dbc0b3f23478f1fcc8f591f0..fd3b2a39825b291d9c82fa9191d5f461d8ffc8c3 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -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)...