Rewrote reset and some extensions:

[mailer.git] / inc / daily / daily_holiday.php

diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php
index 8087a03b3e2bf84868c6c173b2cbf934ce69ea35..b72ac9c9eece9e6b43f6a16e216ea0d3272d8f3d 100644 (file)
--- a/inc/daily/daily_holiday.php
+++ b/inc/daily/daily_holiday.php
@@ -38,11 +38,11 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((!isHtmlOutputMode()) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
-       // Do not execute when script is in CSS mode or no daily reset
+} elseif ((!isHtmlOutputMode()) || ((!isDailyResetEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
-} elseif ((!isExtensionActive('holiday')) && (isDebugModeEnabled())) {
-       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-holiday disabled.');
+} elseif (!isExtensionActive('holiday')) {
+       if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-holiday disabled.');
        return;
 }