Fix for PHP error

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

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 6fa497c433138886d0405e1ac956b70ede7b1900..724dca64d277127b298f4cf5a276dfab026fbab0 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -111,7 +111,7 @@ case "update": // Update an extension
                break;
 
        case "0.0.9": // SQL queries for v0.0.9
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rewrite_skip varchar(255) not null default 'login:admin:frametester:mailid'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_rewrite', 'Rewrite-Engine', 'Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";
 
                // Update notes (these will be set as task text!)
@@ -137,7 +137,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;
 }