Fixes for MT_WORD vs. install vs. installed

diff --git a/inc/filters.php b/inc/filters.php
index ebed4a6034f5a088c5e033e2d90ea787247fe58e..64de90acd5085ad54d94acc9ac8b202b1d983f42 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -103,7 +103,6 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__);
        // Init filters
        REGISTER_FILTER('init', 'UPDATE_LOGIN_DATA');
        REGISTER_FILTER('init', 'INIT_RANDOMIZER');
        // Init filters
        REGISTER_FILTER('init', 'UPDATE_LOGIN_DATA');
        REGISTER_FILTER('init', 'INIT_RANDOMIZER');

-       REGISTER_FILTER('init', 'INIT_MEM_CACHE');

 
        // Login failures handler
        REGISTER_FILTER('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
 
        // Login failures handler
        REGISTER_FILTER('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');


@@ -506,11 +505,5 @@ function FILTER_INIT_RANDOMIZER () {
        mt_srand(generateSeed() + constant('_ADD'));
 }
 
        mt_srand(generateSeed() + constant('_ADD'));
 }
 

-// Filter for initializing misc mem-cache arrays (NOT memcache!)
-function FILTER_INIT_MEM_CACHE () {
-       // For LOAD_INC_ONCE()
-       $GLOBALS['cache_array']['load_once'] = array();
-}
-

 //
 ?>
 //
 ?>

diff --git a/inc/functions.php b/inc/functions.php
index 7d96a7ed02e20f7a8627474bd08c1c7a6bafe269..d9e2c4ad7c7912bbfaf8d924b2c5b332cf456ee4 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2603,12 +2603,12 @@ function LOAD_INC ($INC) {
 // Loads an include file once
 function LOAD_INC_ONCE ($INC) {
        // Is it not loaded?
 // Loads an include file once
 function LOAD_INC_ONCE ($INC) {
        // Is it not loaded?

-       if (!isset($GLOBALS['cache_array']['load_once'][$INC])) {
+       if (!isset($GLOBALS['load_once'][$INC])) {

                // Then try to load it
                LOAD_INC($INC);
 
                // And mark it as loaded
                // Then try to load it
                LOAD_INC($INC);
 
                // And mark it as loaded

-               $GLOBALS['cache_array']['load_once'][$INC] = "loaded";
+               $GLOBALS['load_once'][$INC] = "loaded";

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 065726a9d276ca44e3bd7bc80caefb4e1059c565..b7ed234cead10c4d914507e34195fe4fc282f712 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -41,6 +41,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
        require($INC);
 }
 

+// Load sql_patches here
+LOAD_EXTENSION("sql_patches");
+

 // Init variables
 $mysql = "";
 if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
 // Init variables
 $mysql = "";
 if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');

diff --git a/inc/language.php b/inc/language.php
index 0c10b177870c703e1ab13df1333e1a61f5f9ba5e..61681eec05173da0036895bc6e7ea55b98489bdb 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -58,7 +58,7 @@ if (!FILE_READABLE($FQFN)) {
 } // END - if
 
 // Load language file
 } // END - if
 
 // Load language file

-LOAD_INC($INC);
+LOAD_INC_ONCE($INC);

 
 // Check for installation mode
 if (isInstalling()) {
 
 // Check for installation mode
 if (isInstalling()) {

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index e354d7c9c675c4f32590e7811b4c23da9d5a5649..8c9f3c331280950fc6a08ed07945d57e31f5e6e7 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -231,6 +231,9 @@ if ((!isInstalling()) && (isInstalled())) {
                        addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
                } // END - if
        } // END - if
                        addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
                } // END - if
        } // END - if

+
+       // Run the init filter chain
+       RUN_FILTER('init');

 }
 
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
 }
 
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {