Notice fixed, email navi now shown if on 2+ page

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

diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php
index 892b52e8d8d68b1df3a91028855c505cf060e640..cef68ef7847110e4fc3450c7854fe9a5de7a1a82 100644 (file)
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.php
@@ -93,7 +93,7 @@ case "update": // Update an extension
 
        case "0.0.4": // SQL queries for v0.0.4
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Seit <A href=\"".SERVER_URL."/patches/340-Gast_Mitgliedsmenue_Deaktivieren.zip\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+               $UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
                break;
 
        case "0.0.5": // SQL queries for v0.0.5
@@ -123,7 +123,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);
        break;
 }