From e19978838fab78a1ea9bcbbb53cd079c5096b573 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 17 Dec 2008 22:16:06 +0000 Subject: [PATCH] Fixes for cache/theme --- inc/databases.php | 2 +- inc/extensions/ext-sql_patches.php | 6 +++++- inc/loader/load_cache-them.php | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index 64c835393c..a61c098d5c 100644 --- 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 92b8b05ed5..e350aca173 100644 --- 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 f8d70df07d..fd3b2a3982 100644 --- 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)... -- 2.39.5