Tons of rewrites (SQL queries), surfbar nearly finished (working: surfing with static...

[mailer.git] / inc / extensions / ext-holiday.php

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 29215c7ce20cbd0bb6833c7ffcb5d18f4ca09479..a5937ff22537f92357276e2ce404dfde83a44891 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -225,14 +225,14 @@ case "update": // Update an extension
 
 default: // Do stuff when extension is loaded
        $dummy = LOAD_CONFIG();
-       $_CONFIG = array_merge($_CONFIG, $dummy);
+       $_CONFIG = merge_array($_CONFIG, $dummy);
        unset($dummy);
 
        // Do we have a daily-reset-run?
-       if (((defined('__DAILY_RESET')) && ($_CONFIG['holiday_mode'] == "RESET")) || ($_CONFIG['holiday_mode'] == "DIRECT"))
+       if (((isBooleanConstantAndTrue('__DAILY_RESET')) && ($_CONFIG['holiday_mode'] == "RESET")) || ($_CONFIG['holiday_mode'] == "DIRECT"))
        {
                // Ok, let's check for finished holidays and unlock those accounts
-               $INC_POOL[] = PATH."inc/reset/reset_holiday.php";
+               $INC_POOL[] = sprintf("%sinc/reset/reset_holiday.php", PATH);
        }
        break;
 }