Naming convention applied, wrapper functions may use __FUNCTION__ as first index

[mailer.git] / inc / reset / reset_beg.php

diff --git a/inc/reset/reset_beg.php b/inc/reset/reset_beg.php
index 43b1eaa1c331fb61a22b0be061bbf5513acee1cb..7ce84856c4b14e01ee96dc6637886b2b1d3fde34 100644 (file)
--- a/inc/reset/reset_beg.php
+++ b/inc/reset/reset_beg.php
@@ -40,10 +40,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled()) || (getConfig('beg_rallye') == 'Y')) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
-} elseif (!isExtensionActive('beg')) {
+} elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }