Debug mode removed from reset

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

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 29215c7ce20cbd0bb6833c7ffcb5d18f4ca09479..a7210a86e351095448a4a2a468faf96f27a899c3 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -225,15 +225,8 @@ 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"))
-       {
-               // Ok, let's check for finished holidays and unlock those accounts
-               $INC_POOL[] = PATH."inc/reset/reset_holiday.php";
-       }
        break;
 }