Fixes for missing arguments and some improvements:

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

diff --git a/inc/reset/reset_doubler.php b/inc/reset/reset_doubler.php
index 11bc8ce134d4f34ad9e50fa6440f9aedcf01f709..64e6348a4aa1653f9402201ade253882fa391e4f 100644 (file)
--- a/inc/reset/reset_doubler.php
+++ b/inc/reset/reset_doubler.php
@@ -40,10 +40,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled()) || (getConfig('doubler_send_mode') != 'RESET')) {
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
-} elseif (!isExtensionActive('doubler')) {
+} elseif ((!isExtensionActive('doubler')) || (getConfig('doubler_send_mode') != 'RESET')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }