Security line in all includes changed

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

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index 7bcce2a914ba0e0cc39e5748e724dff5bb57533d..d334f152bd4958ab8b9a5d0e5c214f273e846d2a 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.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);
 }
@@ -323,9 +322,6 @@ PRIMARY KEY(id)
        break;
 
 default: // Do stuff when extension is loaded
-       $dummy = LOAD_CONFIG();
-       $_CONFIG = merge_array($_CONFIG, $dummy);
-       unset($dummy);
        break;
 }