Final fixes for 'loading cache vs. filters vs. extensions' construct

diff --git a/inc/databases.php b/inc/databases.php
index e1c23e67fdbb2613cd157f5d827d1498833d5f61..90e7918eaf98983a8ea08a5b08f4e9e67ddd729d 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -115,7 +115,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision

-define('CURR_SVN_REVISION', "673");
+define('CURR_SVN_REVISION', "674");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/filters.php b/inc/filters.php
index a870aa199b64b11f74d1085eac428a3ae0efae79..0fc19fa5527b4408f9d42d6e94074e5c2b0c11ce 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -211,7 +211,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
        // Then run all filters
        foreach ($filters[$filterName] as $filterFunction=>$active) {
                // Debug message
        // Then run all filters
        foreach ($filters[$filterName] as $filterFunction=>$active) {
                // Debug message

-               //* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): name={$filterName}, func={$filterFunction}, active={$active}<br />\n";
+               //* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): name={$filterName},func={$filterFunction},active={$active}<br />\n";

 
                // Is the filter active?
                if ($active == "Y") {
 
                // Is the filter active?
                if ($active == "Y") {

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index fae66b3b568d0b6bd4fc9ba83a9b5dd6fc6b0f11..bb161afa63f28e1822368897acd48639d39c94e0 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -154,14 +154,17 @@ if ($cacheMode == "load") {
        // No database load needed
        $res_ext_crt = false;
 
        // No database load needed
        $res_ext_crt = false;
 

-       // Load more cache files (like admins)
-       require_once(PATH."inc/load_cache.php");
-

        // Load all extension files
        foreach ($EXT_POOL as $ext) {
                LOAD_EXTENSION($ext);
        } // END - foreach
 
        // Load all extension files
        foreach ($EXT_POOL as $ext) {
                LOAD_EXTENSION($ext);
        } // END - foreach
 

+       // Init filter system
+       INIT_FILTER_SYSTEM();
+
+       // Load more cache files (like admins)
+       require_once(PATH."inc/load_cache.php");
+

        // Remove array
        unset($EXT_POOL);
 } else {
        // Remove array
        unset($EXT_POOL);
 } else {


@@ -250,6 +253,9 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
                }
        } // END - while
 
                }
        } // END - while
 

+       // Init filter system
+       INIT_FILTER_SYSTEM();
+

        if ($cacheMode == "init") {
                // Close cache file
                $cacheInstance->finalize();
        if ($cacheMode == "init") {
                // Close cache file
                $cacheInstance->finalize();

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 9dd80220d7a6834592d32c6a200887b228ba8a85..48e7c90f6070af98712d7ecae3c4913c3fb6905e 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -37,6 +37,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 } // END - if
 
        require($INC);
 } // END - if
 

+// Make cacheInstance global
+global $cacheInstance;
+

 // Let's start with the admins table...
 if (($cacheInstance->loadCacheFile("admins")) && ($cacheInstance->extensionVersionMatches("admins"))) {
        // Load cache
 // Let's start with the admins table...
 if (($cacheInstance->loadCacheFile("admins")) && ($cacheInstance->extensionVersionMatches("admins"))) {
        // Load cache

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index d7da6fd7d0b6478b1ab1b7c959d611f3cd4ec203..dc7bc67c4e859752881c78029277defbbe873418 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -37,6 +37,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
        require($INC);
 }
 

+// Make cacheInstance global
+global $cacheInstance;
+

 // Next cached table is the configuration (config)...
 if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load config from cache
 // Next cached table is the configuration (config)...
 if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load config from cache

diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 5d5196efddec8fd34c03c465e76123013f03657e..4b5624dec1c5bd168adf0551085833da1abf00d9 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);
 }
 
        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
 // Next cached table is the module registry (mod_reg)...
 if (($cacheInstance->loadCacheFile("mod_reg")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load cache

diff --git a/inc/loader/load_cache-refdepths.php b/inc/loader/load_cache-refdepths.php
index 1cd352bc02c411c1ea2e47595cf16eaad13deeb5..11a47438ae5135a2a9ee74a060292aba47a4a78f 100644 (file)
--- a/inc/loader/load_cache-refdepths.php
+++ b/inc/loader/load_cache-refdepths.php
@@ -37,6 +37,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
        require($INC);
 }
 

+// Make cacheInstance global
+global $cacheInstance;
+

 // Next cached table is the referal system (refdepths)...
 if (($cacheInstance->loadCacheFile("refdepths")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load referal system from cache
 // Next cached table is the referal system (refdepths)...
 if (($cacheInstance->loadCacheFile("refdepths")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load referal system from cache

diff --git a/inc/loader/load_cache-refsystem.php b/inc/loader/load_cache-refsystem.php
index c44c9d6d1325b08468df62e5400ec9b0b8a360f6..4c175223c4663f4c618150b58add2ab21ad6d695 100644 (file)
--- a/inc/loader/load_cache-refsystem.php
+++ b/inc/loader/load_cache-refsystem.php
@@ -37,6 +37,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
        require($INC);
 }
 

+// Make cacheInstance global
+global $cacheInstance;
+

 // Next cached table is the referal system (refsystem)...
 if (($cacheInstance->loadCacheFile("refsystem")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load referal system from cache
 // Next cached table is the referal system (refsystem)...
 if (($cacheInstance->loadCacheFile("refsystem")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load referal system from cache

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index fd3b2a39825b291d9c82fa9191d5f461d8ffc8c3..673d82693c9d8a9d11ee7c89f62113295ceb5db5 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;
 }
 
        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
 // Next cached table is the referal system (themes)...
 if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersionMatches("theme"))) {
        // Load referal system from cache