Some internal TODOs fixed, rewrites to script inclusion

[mailer.git] / inc / modules / member / action-

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index 9f305f19f2f36d7a18c8d883d5d06252203a75a0..7fcb665657897a4e9dcea8737a76602251da7105 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_LOGGED_IN()) {
        LOAD_URL(URL."/modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "");
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
@@ -52,9 +52,9 @@ ADD_DESCR("member", __FILE__);
 $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
-       include_once($INC_WHAT);
+       require($INC_WHAT);
 } else {
-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
 }
 
 //