Heacy rewrite/cleanup:

[mailer.git] / inc / loader / load-extension.php

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index 0d35dd45019d89ee2d186455ffb9bb5a0f573585..acaeb8514527ddf14dce4713d987070e42728e6e 100644 (file)
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -40,8 +40,9 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (isInstallationPhase()) {
+} elseif (isInstaller()) {
        // Do not run in installation phase
+       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
        return FALSE;
 }
 
@@ -60,7 +61,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
                // Loop through all
                foreach ($EXT_DUMMY['ext_name'] as $k => $ext_name) {
-                       // Load CSS file
+                       // Load CSS file?
                        if ($EXT_DUMMY['ext_css'][$k] == 'Y') {
                                addExtensionCssFile($ext_name . '.css');
                        } // END - if
@@ -132,7 +133,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
        // Remove array and mark cache as loaded
        unset($EXT_POOL);
-} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
+} elseif ((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();