Fixes for broken extension loader and language error. Resolves #87/#88

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 07fd2858b0eba2875b4bc0b4b7df4efbdd0d3dfe..bb8e8eefd19dd2deb3e52f2a9e61ef14ebe3a1ee 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -55,7 +55,10 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
        } // END - if
 
        // Construct FQFN for extension file
        } // END - if
 
        // Construct FQFN for extension file

-       $extInclude = sprintf("inc/extensions/ext-%s.php", $ext_name);
+       $FQFN = sprintf("%sinc/extensions/ext-%s.php",
+               constant('PATH'),
+               $ext_name
+       );

 
        // Is the extension file NOT there?
        if (!FILE_READABLE($extInclude)) {
 
        // Is the extension file NOT there?
        if (!FILE_READABLE($extInclude)) {


@@ -102,7 +105,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 
        // Include the extension file
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded.");
 
        // Include the extension file
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded.");

-       LOAD_INC($extInclude);
+       require($extInclude);

 
        // Is this extension deprecated?
        if ($EXT_DEPRECATED == "Y") {
 
        // Is this extension deprecated?
        if ($EXT_DEPRECATED == "Y") {