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

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

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index b26919897f161afa340e5a6572f8e886be4bf0e4..8e121a3e08b9a7a250693baa23a743970ca03c91 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -225,10 +225,7 @@ case "update": // Update an extension
 
 default: // Do stuff when extension is loaded
        $dummy = LOAD_CONFIG();
-       // Copy data to config array
-       $_CONFIG['holiday_max']  = $dummy['holiday_max'];  // Maximum days for holiday
-       $_CONFIG['holiday_lock'] = $dummy['holiday_lock']; // Lock deactivation in member area for X seconds
-       $_CONFIG['holiday_mode'] = $dummy['holiday_mode']; // Mode for activating holiday
+       $_CONFIG = array_merge($_CONFIG, $dummy);
        unset($dummy);
 
        // Do we have a daily-reset-run?