New functions introduced, several 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 e9ec739204e1c4da2c43f43b196b5146fa58e312..e445def99e2ab9f92f75edb8c1750e57e6a030bd 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 07/24/2004 *
- * ================                             Last change: 07/31/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 07/24/2004 *
+ * ===================                          Last change: 07/31/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-holiday.php                                 *
@@ -82,8 +82,8 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
        $content = merge_array($content, SQL_FETCHARRAY($result2));
 
        // Fix missing entries
-       if (empty($content['timestamp'])) $content['timestamp'] = 0;
-       if (empty($content['timestamp_ordered'])) $content['timestamp_ordered'] = 0;
+       if (empty($content['timestamp'])) $content['timestamp'] = '0';
+       if (empty($content['timestamp_ordered'])) $content['timestamp_ordered'] = '0';
 
        if ((($content['timestamp'] + getConfig('holiday_lock')) > time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) {
                // Mail order is to close away!
@@ -99,7 +99,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
                }
 
                // Display message and exit here
-               loadTemplate('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), generateDateTime($stamp, 1)));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_MEMBER_ORDER', generateDateTime($stamp, 1)));
                return;
        }
 } // END - if