Obsoleted parameters to SQL_AFFECTED_ROWS() removed, OPEN_TABLE() and CLOSE_TABLE...

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

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 23d5cd1cdf2657d3e4e430ab343dcbfa3a3bd205..84dd50d1edd4a0794fe4223dd3d61a37613a5d8f 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -129,8 +129,6 @@ case "update": // Update an extension
                break;
 
        case "0.1.0": // SQL queries for v0.2.1
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD nl_month CHAR(2) NOT NULL DEFAULT '".date("m", time())."'";
-
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Nur bei installierter Erweiterung <STRONG>html_mail</STRONG> k&ouml;nnen Sie auch HTML-Mails versenden.";
                break;
@@ -139,7 +137,7 @@ case "update": // Update an extension
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config DROP nl_currency";
 
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "W&auml;hrung auf die Erweiterung <A href=\"".SERVER_URL."/extensions/ext-other.zip\"><STRONG>ext-other.zip</STRONG></A> verlagert. Bitte auch diese aktualisieren.";
+               $UPDATE_NOTES = "W&auml;hrung auf die Erweiterung <A href=\"#\"><STRONG>ext-other.zip</STRONG></A> verlagert. Bitte auch diese aktualisieren.";
                break;
 
        case "0.1.2": // SQL queries for v0.1.2
@@ -151,7 +149,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 +170,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;
 }