- Concept of a safe for collected points added

[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 c387d98aa6f3110722ac7de46d0126ada673427a..2ed851d3fa26b29f637375ce9767290888cd1938 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -577,13 +577,9 @@ PRIMARY KEY (id)
        break;
 
 default: // Do stuff when extension is loaded
-       $dummy = LOAD_CONFIG();
-
        // When the sql_patches is not installed we cannot load it's configuration... *sigh*
        if (GET_EXT_VERSION("sql_patches") != '') {
                $_CONFIG['secret_key']        = "";
-               //die("<pre>".print_r($dummy, true)."</pre>");
-               $_CONFIG = merge_array($_CONFIG, $dummy);
 
                // Read key from secret file
                if ((empty($_CONFIG['file_hash'])) || (empty($_CONFIG['master_salt'])) || (empty($_CONFIG['pass_scramble']))) {
@@ -613,11 +609,11 @@ default: // Do stuff when extension is loaded
                } // END - if
 
                // Transfer words/numbers to constants
-               define('POINTS'  , $dummy['points_word']);
-               define('MT_WORD' , $dummy['mt_word']);
-               define('MT_WORD2', $dummy['mt_word2']);
-               define('MT_WORD3', $dummy['mt_word3']);
-               define('_MAX'    , $dummy['rand_no']);
+               define('POINTS'  , $_CONFIG['points_word']);
+               define('MT_WORD' , $_CONFIG['mt_word']);
+               define('MT_WORD2', $_CONFIG['mt_word2']);
+               define('MT_WORD3', $_CONFIG['mt_word3']);
+               define('_MAX'    , $_CONFIG['rand_no']);
        } else {
                // Set some lame ;-) default settings
                $_CONFIG['def_refid'] = 0;
@@ -629,9 +625,6 @@ default: // Do stuff when extension is loaded
                define('MT_WORD2', DEFAULT_MT_WORD2);
                define('POINTS'  , DEFAULT_POINTS);
        }
-
-       // Remove dummy config array
-       unset($dummy);
        break;
 }