Fix for PHP error

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

diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php
index defda69374db672a8d228423129ccf2d0241e546..0a36b7192821aebfa5ad25ea4e0eff4a2a6af313 100644 (file)
--- a/inc/extensions/ext-maintenance.php
+++ b/inc/extensions/ext-maintenance.php
@@ -51,7 +51,7 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
-       $SQLs[] = "alter table "._MYSQL_PREFIX."_config add maintenance enum('Y', 'N') not null default 'N';";
+       $SQLs[] = "alter table "._MYSQL_PREFIX."_config add maintenance ENUM('Y', 'N') NOT NULL DEFAULT 'N';";
        if (SQL_NUMROWS(SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_admin_menu WHERE what='maintenance' LIMIT 1", __FILE__, __LINE__)) == 0)
        {
                // Insert menu only when not exists
@@ -110,16 +110,16 @@ case "update": // Update an extension
        break;
 
 default: // Do stuff when extension is loaded
-       $DUMMY = LOAD_CONFIG("0");
-       $CONFIG['maintenance'] = $DUMMY['maintenance'];
-       unset($DUMMY);
+       $dummy = LOAD_CONFIG();
+       $_CONFIG = merge_array($_CONFIG, $dummy);
+       unset($dummy);
        break;
 }
 // Language file prefix
 $EXT_LANG_PREFIX = "maintenance";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'Y';
+$EXT_ALWAYS_ACTIVE = "Y";
 
 //
 ?>