Password reset for admin login added (still buggy if cache is installed and sql_patch...

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

diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index fe51e4f71212e67127cf09c1ad4ebbbac4beb05a..9eedddefcd58deffd1c0624c4c00bce6ff19b2bc 100644 (file)
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -77,7 +77,7 @@ case "update": // Update an extension
        {
        case "0.1": // SQL queries for v0.1
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Wenn t&auiml;glicher Reset war, wird eine benötigte Include-Datei nicht mehr von daily-reset.php eingebunden, sondern von der Erweiterungsdatei selber.";
+               $UPDATE_NOTES = "Wenn täglicher Reset war, wird eine benötigte Include-Datei nicht mehr von daily-reset.php eingebunden, sondern von der Erweiterungsdatei selber.";
                break;
 
        case "0.2": // SQL queries for v0.2
@@ -183,17 +183,15 @@ PRIMARY KEY(id)
        break;
 
 default: // Do stuff when extension is loaded
-       $DUMMY = LOAD_CONFIG("0");
+       $dummy = LOAD_CONFIG();
 
        // Copy config to main array
-       $CONFIG['birthday_points'] = $DUMMY['birthday_points'];
-       $CONFIG['birthday_mode']   = $DUMMY['birthday_mode'];
-       $CONFIG['birthday_active'] = $DUMMY['birthday_active'];
+       $_CONFIG = array_merge($_CONFIG, $dummy);
 
        // Save some RAM...
-       unset($DUMMY);
+       unset($dummy);
 
-       if ((defined('__DAILY_RESET')) && ($CONFIG['birthday_points'] > 0))
+       if ((defined('__DAILY_RESET')) && ($_CONFIG['birthday_points'] > 0))
        {
                // Daily reset was run and we shall pay points so we start checking for members who
                // has a birthday for today