X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=98a07f7fdc1e84ba11223ea6f15df0ec47291f5b;hb=5736dfb1b51bff78b3594a166f350e76784fa0ff;hp=dd8a45bb6594a00886977098b4cd2ecc15d9037a;hpb=c4674069e62a14c340e233be0b2c9ce627a9339c;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index dd8a45bb65..98a07f7fdc 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/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,22 +77,22 @@ 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']);
-			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
+			sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
 			// Remember userid for admin
 			$admin .= $content['userid']."\n";
 		} // END - if
 
 		// Send mail to admins
-		sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin, 0);
+		sendAdminNotification('{--ADMIN_HOLIDAY_UNLOCK_SUBJECT--}', 'admin_holiday_unlock', $admin);
 
 		// Run all SQLs
 		runFilterChain('run_sqls');
@@ -100,5 +102,5 @@ LIMIT 1",
 	SQL_FREERESULT($result_stop);
 }
 
-//
+// [EOF]
 ?>