_TABLE_TYPE is now replaced

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 9a17fa15c7725804676dc7d0ae447aa3aaadddea..b2bca3ea6e981370752cac884f830f5af679966f 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -52,14 +52,12 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
                return false;
        } // END - if
 
-       // Construct FQFN for extension file
-       $FQFN = sprintf("%sinc/extensions/ext-%s.php",
-               constant('PATH'),
-               $ext_name
-       );
+       // Construct include filename and FQFN for extension file
+       $INC = sprintf("inc/extensions/ext-%s.php", $ext_name);
+       $FQFN = constant('PATH') . $INC;
 
        // Is the extension file NOT there?
-       if (!FILE_READABLE($FQFN)) {
+       if (!INCLUDE_READABLE($INC)) {
                // Debug message
                DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found.", $ext_name));
 
@@ -383,7 +381,7 @@ function GET_EXT_VERSION ($ext_name) {
 
                // Count cache hits
                incrementConfigEntry('cache_hits');
-       } elseif ((!isset($GLOBALS['cache_instance'])) || (!is_object($GLOBALS['cache_instance']))) {
+       } elseif (!isCacheInstanceValid()) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
                        array($ext_name), __FILE__, __LINE__);