More fixes (missing array elements)

[mailer.git] / inc / modules / admin / what-del_holiday.php

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 302999f7e5091c7070f269bc5c4e797a0c7aaf02..04ab29ecd2b484ab9a163988bed9b08af0bb874a 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -77,8 +77,8 @@ WHERE
 LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Prepare loaded data for the
-                       $content['holiday_start'] = generateDateTime($content['holiday_start'], 3);
-                       $content['holiday_end']   = generateDateTime($content['holiday_end']  , 3);
+                       $content['holiday_start'] = generateDateTime($content['holiday_start'], '3');
+                       $content['holiday_end']   = generateDateTime($content['holiday_end']  , '3');
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_removed', $content, $content['userid']);
@@ -89,7 +89,9 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                // Free result
                SQL_FREERESULT($result);
        } // END - foreach
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_HOLIDAY_MULTI_DELETE', $count));
+
+       // Display final message
+       displayMessage('{%message,ADMIN_HOLIDAY_MULTI_DELETE=' . $count . '%}');
 } elseif (isGetRequestParameterSet('userid')) {
        // Set default message
        $message = '{--ADMIN_HOLIDAY_SINGLE_404--}';
@@ -126,7 +128,7 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
        SQL_FREERESULT($result_load);
 
        // Output message
-       loadTemplate('admin_settings_saved', false, $message);
+       displayMessage($message);
 } else {
        // Add member selection box
        addMemberSelectionBox();