Tons of rewrites (SQL queries), surfbar nearly finished (working: surfing with static...

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

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 669222adb7d42e7ac50cc4ce0778680061b4cd8d..2d7ea00271c2495c0fe8879ee06ba2cfe079cec8 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -567,7 +567,7 @@ default: // Do stuff when extension is loaded
        if (GET_EXT_VERSION("sql_patches") != '') {
                $_CONFIG['secret_key']        = "";
                //die("<pre>".print_r($dummy, true)."</pre>");
-               $_CONFIG = array_merge($_CONFIG, $dummy);
+               $_CONFIG = merge_array($_CONFIG, $dummy);
 
                // Read key from secret file
                if ((empty($_CONFIG['file_hash'])) || (empty($_CONFIG['master_salt'])) || (empty($_CONFIG['pass_scramble']))) {