X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=0b07bf1a30863cde01c1b1bb40f966f3532f0a62;hb=d0db163274524c1ac548146db60d4543abcec4a9;hp=2ddd8df6870217a9aa2e3eccc0263c663e0c11f5;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 2ddd8df687..0b07bf1a30 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 07/31/2003 *
- * ===============                              Last change: 08/02/2003 *
+ * Mailer v0.2.1-FINAL                                Start: 07/31/2003 *
+ * ===================                          Last change: 08/02/2003 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : holiday_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 *
@@ -55,6 +56,7 @@ ORDER BY
 	if (SQL_NUMROWS($result_stop) > 0) {
 		// We foud at least one
 		$admin = '';
+
 		// Init SQLs
 		initSqls();
 
@@ -75,11 +77,11 @@ LIMIT 1",
 				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Prepare array
-			$content = array(
-				'holiday_end'      => generateDateTime($content['holiday_end']  , '3'),
-				'holiday_start'    => generateDateTime($content['holiday_start'], '3'),
+			$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']);
@@ -90,7 +92,7 @@ LIMIT 1",
 		} // END - if
 
 		// Send mail to admins
-		sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin, '0');
+		sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin);
 
 		// Run all SQLs
 		runFilterChain('run_sqls');
@@ -100,5 +102,5 @@ LIMIT 1",
 	SQL_FREERESULT($result_stop);
 }
 
-//
+// [EOF]
 ?>