New method generateExtensionInactiveMessage() introduced

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

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index 4d9e68bf8e83d2c6e5d1ea0b3b956b117cea095c..7df879cded1724abccfc5f8b0e3dcd2b5a4a7188 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -40,8 +40,8 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, EXTENSION_PROBLEM_EXT_INACTIVE, "");
+} elseif ((!EXT_IS_ACTIVE('')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage(''));
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
@@ -53,9 +53,9 @@ ADD_DESCR('guest', __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/guest/what-%s.php", $GLOBALS['what']);
-if (FILE_READABLE($INC)) {
+if (isIncludeReadable($INC)) {
        // Ok, we finally load the guest action module
-       LOAD_INC($INC);
+       loadInclude($INC);
 } elseif ($IS_VALID) {
        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
 } else {