Fix for many

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 37662440bf62c5a087b32d8a50084a725a5be654..b08a8deb34f52a883168b37025ab157351d1f777 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -72,11 +72,11 @@ LIMIT 1",
                        $content = merge_array($content, SQL_FETCHARRAY($result_holiday));
 
                        // Prepare all data for the template
                        $content = merge_array($content, SQL_FETCHARRAY($result_holiday));
 
                        // Prepare all data for the template

-                       $content = array(
+                       $content = merge_array($content, array(

                                'activated' => generateDateTime($content['holiday_activated'], 1),
                                'start'     => generateDateTime($content['holiday_start']    , 1),
                                'end'       => generateDateTime($content['holiday_end']      , 1)
                                'activated' => generateDateTime($content['holiday_activated'], 1),
                                'start'     => generateDateTime($content['holiday_start']    , 1),
                                'end'       => generateDateTime($content['holiday_end']      , 1)

-                       );
+                       ));

 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);