Another column fix

[mailer.git] / inc / modules / admin / what-del_email.php

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 183410103e621a5710921a89ac93b9fb917fe17a..bcc1fcc5d2607d21e02db72233b71d60ee9fd25c 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -35,7 +35,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -68,10 +68,10 @@ if (!empty($_GET['mid'])) {
                LOAD_TEMPLATE("admin_del_email_normal");
 
                // Transfer data to data array
-               $DATA = array($url, $subject);
+               $DATA = array('url' => $url, 'subject' => $subject);
 
                // Load email template and send the email away
-               $msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", "", $sender);
+               $msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);
                SEND_EMAIL($sender, MEMBER_ORDER_DELETED, $msg_user);
 
                // Delete mail from queue