Moved call of initExtraRegistrationSql() out of filter which caused trouble. Now...

diff --git a/inc/filter/register_filter.php b/inc/filter/register_filter.php
index 0120da91eebcfd1b38e651062a178e4ddf18de39..ac93c916fa47f670166d524a02d1e4f3c4437ec6 100644 (file)
--- a/inc/filter/register_filter.php
+++ b/inc/filter/register_filter.php
@@ -104,9 +104,6 @@ function FILTER_PRE_USER_REGISTRATION_GENERIC ($filterData) {
        $GLOBALS['register_country_row'] = '`country`';
        $GLOBALS['register_country_data'] = substr(postRequestElement('cntry'), 0, 2);
 
-       // Init extra SQL data
-       initExtraRegistrationSql();
-
        // Init "status" as for many users
        setPostRequestElement('status', 'UNCONFIRMED');
 

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 3c750c2284a1e8433c7678f7c3de9cc994e12212..3a3d1f2dd3cd99c02665676d73825b0cca7ff053 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -294,6 +294,9 @@ function doUserRegistration () {
                'init_done' => false
        );
 
+       // Init extra SQL data
+       initExtraRegistrationSql();
+
        // Run the pre-registration chain
        $filterData = runFilterChain('pre_user_registration', $filterData);
 
@@ -506,24 +509,12 @@ function initExtraRegistrationSql () {
 
 // Add extra column for registration SQL
 function addExtraRegistrationColumns ($column) {
-       // Is it set?
-       if (!isset($GLOBALS['register_sql_columns'])) {
-               // Then initialize it
-               initExtraRegistrationSql();
-       } // END - if
-
        // Add column
        $GLOBALS['register_sql_columns'] .= $column;
 }
 
 // Add extra data for registration SQL
 function addExtraRegistrationData ($data) {
-       // Is it set?
-       if (!isset($GLOBALS['register_sql_data'])) {
-               // Then initialize it
-               initExtraRegistrationSql();
-       } // END - if
-
        // Add column
        $GLOBALS['register_sql_data'] .= $data;
 }