More rewrites to make use of (cached) wrapper functions

[mailer.git] / inc / extensions-functions.php

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 44a8ea04f1435c2b91450384b8e4cecb2818f7b2..ee5ff4908fc385e56f38c08793343a316683917c 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -125,7 +125,7 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run =
                        // Download functions file
                        loadIncludeOnce($funcsInclude);
                } // END - if
-       } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
+       } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getScriptOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
                // No functions file is not so good...
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no own functions file or we cannot read from it. mode=%s",
                        $ext_name,
@@ -593,7 +593,7 @@ function getExtensionVersion ($ext_name, $force = false) {
 
                // Count cache hits
                incrementStatsEntry('cache_hits');
-       } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getOutputMode() != 0)) {
+       } elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getScriptOutputMode() != 0)) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT `ext_version` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
                        array($ext_name), __FUNCTION__, __LINE__);
@@ -977,7 +977,7 @@ function createNewExtensionTask ($ext_name) {
 
                // Template file
                $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
-                       getConfig('PATH'),
+                       getPath(),
                        getLanguage(),
                        $ext_name
                );
@@ -1603,7 +1603,7 @@ function getExtensionHasCss () {
 
        // Construct FQFN for check
        $FQFN = sprintf("%stheme/%s/css/%s.css",
-               getConfig('PATH'),
+               getPath(),
                getCurrentTheme(),
                getCurrentExtensionName()
        );