Conflict solved, more templates added, TODOs.txt updated:

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 49e5a580eea77a04c6e3ac3fcdb51def2692f3dc..59c1f0192f29f6005113ce91fa2cea04f8588a34 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -72,7 +73,10 @@ function autostartReferalRallyes ($result) {
        $result_user = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
 
        // Let's begin with the userids...
-       while ($content = merge_array($content, SQL_FETCHARRAY($result_user))) {
+       while ($row = SQL_FETCHARRAY($result_user)) {
+               // Merge both arrays
+               $content = merge_array($content, $row);
+
                $un = false;
 
                // Get refs by userid
@@ -82,7 +86,7 @@ function autostartReferalRallyes ($result) {
                // Check if line is already included...
                $result_ref = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s AND `userid`=%s LIMIT 1",
                        array(bigintval($id), bigintval($content['userid'])), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result_ref) == '0') {
+               if (SQL_NUMROWS($result_ref) == 0) {
                        // Free memory
                        SQL_FREERESULT($result_ref);
 
@@ -346,7 +350,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
                SQL_FREERESULT($result);
 
                if ($notify == 'Y') {
-                       // Transfer all neccessary data to the global $content array
+                       // Transfer all neccessary data to $content array
                        $content['start'] = generateDateTime($start, 2);
                        $content['end']   = generateDateTime($end  , 2);
                        $content['now_t'] = generateDateTime(time(), 2);