Heacy rewrite/cleanup:

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

diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php
index f52226607f879c1b5501f2c210c91814409141cb..44178611f465776439652573341f256b3bd92b33 100644 (file)
--- a/inc/loader/load-modules.php
+++ b/inc/loader/load-modules.php
@@ -38,8 +38,12 @@
 // 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;
+} elseif (!isExtensionInstalled('mods')) {
+       // Do not run if ext-mods is missing
        return FALSE;
 }
 
@@ -87,7 +91,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                } // END - foreach
        } // END - foreach
        unset($modArray);
-} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
+} elseif ((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();