Fixes for filter 'load_includes'

diff --git a/inc/autopurge.php b/inc/autopurge.php
index c3a206f0fb2214e6fa7e05150a2ad64819f47c6c..75bddcd86b15f2864ccb3d377222099beda077e1 100644 (file)
--- a/inc/autopurge.php
+++ b/inc/autopurge.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/autopurge/", "purge-");
 
 // Run the filter
 $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/autopurge/", "purge-");
 
 // Run the filter

-RUN_FILTER('load_includes');
+RUN_FILTER('load_includes', $INC_POOL);

 
 // Run filters for extra autopurge
 RUN_FILTER('extra_autopurge');
 
 // Run filters for extra autopurge
 RUN_FILTER('extra_autopurge');

diff --git a/inc/check-reset.php b/inc/check-reset.php
index cf6c67c6aa2e453babb1c695fd65f0710c01176e..88335c12cce072a487cc0d14249df36b98cf7ac4 100644 (file)
--- a/inc/check-reset.php
+++ b/inc/check-reset.php
@@ -47,7 +47,7 @@ if ((date("d", getConfig('last_update')) != date("d", time())) && ((!defined('mx
        $INC_POOL = RESET_ADD_INCLUDES();
 
        // Run the filter
        $INC_POOL = RESET_ADD_INCLUDES();
 
        // Run the filter

-       RUN_FILTER('load_includes');
+       RUN_FILTER('load_includes', $INC_POOL);

 } // END - if
 
 //
 } // END - if
 
 //

diff --git a/inc/databases.php b/inc/databases.php
index 7c50726c619854138160eeef21bc7f1371ff88ea..3bb3fe226e7d296d62a5904c68f46caafae8ffb7 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', "669");
+define('CURR_SVN_REVISION', "670");

 
 // 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/extensions.php b/inc/extensions.php
index ccd38d91f230e17c4163bdc10063e44702954091..f2fd57bcceb5f75e7e005bbed93aad4a824156f8 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -486,7 +486,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                // In real-mode execute any existing includes
                if (!$dry_run) {
                        $cacheArray['inc_pool'][$ext_name] = $INC_POOL;
                // In real-mode execute any existing includes
                if (!$dry_run) {
                        $cacheArray['inc_pool'][$ext_name] = $INC_POOL;

-                       RUN_FILTER('load_includes');
+                       RUN_FILTER('load_includes', $INC_POOL);

                        $INC_POOL = $cacheArray['inc_pool'][$ext_name];
                        unset($cacheArray['inc_pool'][$ext_name]);
                } // END - if
                        $INC_POOL = $cacheArray['inc_pool'][$ext_name];
                        unset($cacheArray['inc_pool'][$ext_name]);
                } // END - if

diff --git a/inc/filters.php b/inc/filters.php
index d582202ac6a02ac4297ec79673b0d6897687e6af..82f9dcb27ac6fd26cf9ab596e6a2160eb4e1417c 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -387,14 +387,14 @@ function FILTER_SOLVE_TASK ($data) {
 }
 
 // Filter to load include files
 }
 
 // Filter to load include files

-function FILTER_LOAD_INCLUDES ($data) {
-       global $INC_POOL, $CSS;
+function FILTER_LOAD_INCLUDES ($INC_POOL) {
+       global $CSS;

 
        // Is it an array?
        if ((!isset($INC_POOL)) || (!is_array($INC_POOL))) {
                // Then abort here
                DEBUG_LOG(__FILE__, __LINE__, "INC_POOL is no array!");
 
        // Is it an array?
        if ((!isset($INC_POOL)) || (!is_array($INC_POOL))) {
                // Then abort here
                DEBUG_LOG(__FILE__, __LINE__, "INC_POOL is no array!");

-               return $data;
+               return;

        } // END - if
 
        // Check for added include files
        } // END - if
 
        // Check for added include files


@@ -404,12 +404,9 @@ function FILTER_LOAD_INCLUDES ($data) {
                        require_once($fqfn);
                } // END - foreach
 
                        require_once($fqfn);
                } // END - foreach
 

-               // Remove array
-               unset($INC_POOL);
+               // Reset array
+               $INC_POOL = array();

        } // END - if
        } // END - if

-
-       // Return $data
-       return $data;

 }
 
 // Filter for running SQL commands
 }
 
 // Filter for running SQL commands

diff --git a/inc/load_cache.php b/inc/load_cache.php
index 3039a408d1fe349dd9fd9995365058fc785ae3a1..4e849ba4402108eb778629cd0d37c29295978d74 100644 (file)
--- a/inc/load_cache.php
+++ b/inc/load_cache.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/loader/", "load_cache-");
 
 // Run the filter
 $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/loader/", "load_cache-");
 
 // Run the filter

-RUN_FILTER('load_includes');
+RUN_FILTER('load_includes', $INC_POOL);

 
 //
 ?>
 
 //
 ?>

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 7ec8ecc44f4a81046218db101cfbb23b069a4e75..fae66b3b568d0b6bd4fc9ba83a9b5dd6fc6b0f11 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -263,7 +263,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 } // END - if
 
 // Run the filter
 } // END - if
 
 // Run the filter

-RUN_FILTER('load_includes');
+RUN_FILTER('load_includes', $INC_POOL);

 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {

diff --git a/inc/pool-update.php b/inc/pool-update.php
index b2fd7c8ca84b45e89504b5f213f927173fef4b41..32256682f5370933dbb4853696c23d9f8e04a4c5 100644 (file)
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -50,7 +50,7 @@ $GLOBALS['pool_cnt'] = 0;
 $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/pool/", "pool-");
 
 // Run the filter
 $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/pool/", "pool-");
 
 // Run the filter

-RUN_FILTER('load_includes');
+RUN_FILTER('load_includes', $INC_POOL);

 
 // Remove counter again
 unset($GLOBALS['pool_cnt']);
 
 // Remove counter again
 unset($GLOBALS['pool_cnt']);