Fix for red page blocking all access

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

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 9387596d95468894c636ca2f3aa24939fb588814..7b6c0aeb7ee9a44c9189a8ec6e0777680ab36253 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -224,9 +223,6 @@ case "update": // Update an extension
        break;
 
 default: // Do stuff when extension is loaded
-       $dummy = LOAD_CONFIG();
-       $_CONFIG = merge_array($_CONFIG, $dummy);
-       unset($dummy);
        break;
 }