From 595f8c580b79c347fad020d82dff9c2dd44334bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 26 Dec 2009 10:36:02 +0000 Subject: [PATCH] Fix for many --- inc/reset/reset_holiday.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php index 37662440bf..b08a8deb34 100644 --- 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 = 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']); -- 2.30.2