Heacy rewrite/cleanup:

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

diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php
index 96edeb31639741f77d9a7cf0d230acdc7fb32deb..18c65bd2ecbd4bf68c055b7296a66dc1ea766a7f 100644 (file)
--- a/inc/loader/load-admins.php
+++ b/inc/loader/load-admins.php
@@ -38,8 +38,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;
 }
 
@@ -81,7 +82,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
                $GLOBALS['cache_instance']->removeCacheFile();
                unset($GLOBALS['cache_array']['admin']);
        }
-} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
+} elseif ((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 
@@ -152,7 +153,7 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
                        // This may drive a lot messages to the logfile
                        //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'No entry found in admin_acls to rewrite.');
                }
-       } elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
+       } elseif ((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) {
                // Create cache file here
                $GLOBALS['cache_instance']->init();