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

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

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 23d5cd1cdf2657d3e4e430ab343dcbfa3a3bd205..4b625bc6d6452de83b2b74f16ab0b38e0d44b42c 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -151,7 +151,7 @@ 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);
 
        // URL ends which are used to indentify the end of an URL or email link
@@ -172,10 +172,10 @@ default: // Do stuff when extension is loaded
                '2', '3', '4', '5', '6', '7', '8', '9'
        );
 
-       if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
+       if (isBooleanConstantAndTrue('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
        {
                // Daily reset was run so let's check out for expired newsletter orders
-               $INC_POOL[] = PATH."inc/monthly/monthly_newsletter.php";
+               $INC_POOL[] = sprintf("%sinc/monthly/monthly_newsletter.php", PATH);
        }
        break;
 }