* Dummy extension "yoomedia" added for Yoo! Media's API (Interface 2.0 supported)

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

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 9f78549591e5fe881f98bd3a2905b952e5e9333c..eefd94b2c05d365048367d4f04142c405153ab42 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -260,23 +260,7 @@ case "update": // Update an extension
 
 default: // Do stuff when extension is loaded
        $dummy = LOAD_CONFIG();
-       $_CONFIG['beg_timeout']        = $dummy['beg_timeout'];        // Global timeout
-       $_CONFIG['beg_uid_timeout']    = $dummy['beg_uid_timeout'];    // Timeout for one userid
-       $_CONFIG['beg_ip_timeout']     = $dummy['beg_ip_timeout'];     // Timeout for one IP number
-       $_CONFIG['beg_points']         = $dummy['beg_points'];         // Minimum beggable points
-       $_CONFIG['beg_points_max']     = $dummy['beg_points_max'];     // Maximum beggable points
-       $_CONFIG['beg_uid']            = $dummy['beg_uid'];            // Account to subtract begged points from
-       $_CONFIG['beg_mode']           = $dummy['beg_mode'];           // Payment mode: direct or over referral system?
-       $_CONFIG['beg_month']          = $dummy['beg_month'];          // Current month
-       $_CONFIG['beg_ranks']          = $dummy['beg_ranks'];          // Maximum member who will win
-       $_CONFIG['beg_active']         = $dummy['beg_active'];         // Only active members can win?
-       $_CONFIG['beg_rallye']         = $dummy['beg_rallye'];         // Is the begging rallye activated?
-       $_CONFIG['beg_ral_en_notify']  = $dummy['beg_ral_en_notify'];  // Notify members on enabled rallye?
-       $_CONFIG['beg_ral_di_notify']  = $dummy['beg_ral_di_notify'];  // Notify members on disabled rallye?
-       $_CONFIG['beg_notify_bonus']   = $dummy['beg_notify_bonus'];   // When points are > 0 and bonus extension is installed, a bonus mail with this amount of points will be send instead of an enable-notification!
-       $_CONFIG['beg_new_mem_notify'] = $dummy['beg_new_mem_notify']; // Notify members on disabled rallye?
-       $_CONFIG['beg_notify_wait']    = $dummy['beg_notify_wait'];    // Time to wait in seconds for bonus mails
-       $_CONFIG['beg_include_own']    = $dummy['beg_include_own'];    // Include webmaster's own userid in rallye?
+       $_CONFIG = array_merge($_CONFIG, $dummy);
        unset($dummy);
 
        // Remove old entries