Some rewrites, TODOs handled:

[mailer.git] / inc / modules / admin / action-task.php

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 1b9c69a78456a62895d62909559fece15e7b0f38..8897cf761970194fd9a8b15b4a03ec89f71519a7 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('task')) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'task'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('task'));
        return;
 }
 
@@ -50,9 +50,9 @@ ADD_DESCR('admin', __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (INCLUDE_READABLE($INC)) {
+if (isIncludeReadable($INC)) {
        // Ok, we finally load the admin action module
-       LOAD_INC($INC);
+       loadInclude($INC);
 } else {
        addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }