Fix for many
authorRoland Häder <roland@mxchange.org>
Sat, 26 Dec 2009 10:36:02 +0000 (10:36 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 26 Dec 2009 10:36:02 +0000 (10:36 +0000)
inc/reset/reset_holiday.php

index 3766244..b08a8de 100644 (file)
@@ -72,11 +72,11 @@ LIMIT 1",
                        $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)
-                       );
+                       ));
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);