Required fix for NULL vs. 0 in user_points

[mailer.git] / inc / libs / register_functions.php

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 2c64352d764d6cb2bdf509b08b816b30b5d071bc..e98010cd6650e29d41e6d3f6477fa3ab2709b0cc 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -305,7 +305,7 @@ function doRegistration () {
        } // END - if
 
        // Second: active rallye
-       if (!isBonusNewMemberNotifyEnabled()) {
+       if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) {
                $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
                $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
@@ -339,7 +339,7 @@ function doRegistration () {
                generateHash(postRequestParameter('pass1')),
                bigintval(postRequestParameter('max_mails')),
                bigintval(postRequestParameter('max_mails')),
-               makeDatabaseUserId(postRequestParameter('refid')),
+               makeZeroToNull(postRequestParameter('refid')),
                $hash,
                detectRemoteAddr(),
        ), __FUNCTION__, __LINE__);
@@ -369,11 +369,14 @@ function doRegistration () {
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
-               foreach (postRequestParameter('cat') as $cat => $joined) {
+               foreach (postRequestParameter('cat') as $categoryId => $joined) {
                        if ($joined == 'Y') {
                                // Insert category entry
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s, %s)",
-                                       array($userid, bigintval($cat)), __FUNCTION__, __LINE__);
+                                       array(
+                                               $userid,
+                                               bigintval($categoryId)
+                                       ), __FUNCTION__, __LINE__);
                        } // END - if
                } // END - foreach
        } // END - if