X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-newsletter.php;h=d480fc3b564fd3fb473637342b62f68b3dbaa2cd;hb=933943c6ab989d7c622b9a3d42392943da5a4e4b;hp=2766175901c3a5bd21ba6fbf5e19580791705840;hpb=e1653405d28923c78b2e292125306ccf61138f24;p=mailer.git

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 2766175901..d480fc3b56 100644
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -74,7 +74,7 @@ case "update": // Update an extension
 	switch ($EXT_VER)
 	{
 	case "0.0.1": // SQL queries for v0.0.1
-		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', '', 'Newsletter', 'Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
+		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', NULL, 'Newsletter', 'Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', 'list_newsletter', 'Abbestellungen', 'Alle Abbestellungen auflisten und bearbeiten.', 2)";
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('newsletter', 'config_newsletter', 'Einstellungen', 'Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)";
 		$SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='newsletter', what='send_newsletter', title='Versenden', sort='1' WHERE what='newsletter' LIMIT 1";
@@ -128,7 +128,7 @@ case "update": // Update an extension
 		$UPDATE_NOTES = "Nur bei installierter Erweiterung <STRONG>html_mail</STRONG> k&ouml;nnen Sie auch HTML-Mails versenden.";
 		break;
 
-	case "0.1.0": // SQL queries for v0.1.0
+	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!)
@@ -150,10 +150,9 @@ case "update": // Update an extension
 	break;
 
 default: // Do stuff when extension is loaded
-	$DUMMY = LOAD_CONFIG("0");
-	$CONFIG['nl_charge']   = $DUMMY['nl_charge'];   // Charge for your members to switch off the newsletter
-	$CONFIG['nl_month']    = $DUMMY['nl_month'];    // Last month of check interval
-	unset($DUMMY);
+	$dummy = LOAD_CONFIG();
+	$_CONFIG = array_merge($_CONFIG, $dummy);
+	unset($dummy);
 
 	// URL ends which are used to indentify the end of an URL or email link
 	// Don't use these chars in links... ;-)
@@ -185,7 +184,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "newsletter";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'N';
+$EXT_ALWAYS_ACTIVE = "N";
 
 //
 ?>