New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites:

[mailer.git] / inc / modules / member / what-holiday.php

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index fc3b735786cd1b1565ef6d766bbb3e059080a287..ef2b99b8f4ae0e82ef5020cd96ce2c5816ee889a 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -148,10 +148,10 @@ LIMIT 1",
                sendEmail(getMemberId(), '{--HOLIDAY_MEMBER_SUBJECT--}', $message);
 
                // Send mail to all admins
-               sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getMemberId());
+               sendAdminNotification('{--ADMIN_HOLIDAY_SUBJECT--}', 'admin_holiday_request', $content, getMemberId());
 
                // Create task (we ignore the task id here)
-               createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
+               createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
                // Display message
                loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}');
@@ -210,7 +210,7 @@ LIMIT 1",
                                        array(getMemberId()), __FILE__, __LINE__);
 
                                // Send email to admin
-                               sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId());
+                               sendAdminNotification('{--ADMIN_HOLIDAY_DEAC_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId());
 
                                // Display message to user
                                loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_DEACTIVATED_NOW--}');