Fix for registration

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 0f35a1acfd6b45a39c34da302f09785d42d68338..82337575ee6fa11e6853dcb71b8ff1245beefaa1 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -43,18 +43,15 @@ $EXT_CSS_FILES = array();
 $ADD = "";
 
 // Skip loading extensions
-if ((!mxchange_installed) || (mxchange_installing)) return;
+if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return;
 
 // Load default sql_patches extension if present
-if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."inc/extensions/ext-sql_patches.php"))
-{
+if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."inc/extensions/ext-sql_patches.php")) {
        // Load it...
        $EXT_LOAD_MODE = "";
        require_once(PATH."inc/extensions/ext-sql_patches.php");
        $cacheArray['active_extensions'] = array('sql_patches' => 'Y'); // KEEP THIS ALWAYS ACTIVE!
-}
- else
-{
+} else {
        // Initialize array for "always keep active extensions"
        $cacheArray['active_extensions'] = array();
 }
@@ -79,9 +76,7 @@ if (EXT_IS_ACTIVE("cache"))
 
        // Load language
        if ($cacheMode == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
-}
- else
-{
+} else {
        $cacheMode = "no";
 }
 
@@ -153,7 +148,7 @@ if ($cacheMode == "load")
 {
        // If current user is not admin load only activated extensions
        // The admin shall use every available extension for testing purposes
-       if (!IS_ADMIN()) $ADD = " WHERE ext_active='Y'";
+       if ((!IS_ADMIN()) && ($cacheMode != "init")) $ADD = " WHERE ext_active='Y'";
 
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6")
        {