Several fixes/cleanups

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

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 014d4f70bb6ec61102a170a773597a3ca7d85dfc..0b07bf1a30863cde01c1b1bb40f966f3532f0a62 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -56,6 +56,7 @@ ORDER BY
        if (SQL_NUMROWS($result_stop) > 0) {
                // We foud at least one
                $admin = '';
+
                // Init SQLs
                initSqls();
 
@@ -76,11 +77,11 @@ LIMIT 1",
                                array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
                        // Prepare array
-                       $content = array(
+                       $content = merge_array($content, array(
                                'holiday_end'      => generateDateTime($content['holiday_end']  , 3),
                                'holiday_start'    => generateDateTime($content['holiday_start'], 3),
                                'holiday_comments' => $content['comments']
-                       );
+                       ));
 
                        // Send mail to user
                        $message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
@@ -101,5 +102,5 @@ LIMIT 1",
        SQL_FREERESULT($result_stop);
 }
 
-//
+// [EOF]
 ?>