Debug code commented out

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 7ed3d4943421a8f3f4068b01758fdb77650e5b57..0fbfc12dbf32e5be8e0d9a2623d5ec1bfe4bc54f 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -256,7 +256,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!");
                if ($logout) {
                        // Then redirect to logout
-                       LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
+                       LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
                } else {
                        // Add temporary filter
                        REGISTER_FILTER('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true);
@@ -313,14 +313,14 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        if (($ext_name == "sql_patches") && (($load_mode == "register") || ($load_mode == "remove"))) {
                // Then redirect to logout
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!");
-               LOAD_URL("modules.php?module=admin&logout=1&".$load_mode."=sql_patches");
+               LOAD_URL("modules.php?module=admin&logout=1&".$load_mode."=sql_patches");
        } // END - if
 }
 
 // Check if given extension is active
 function EXT_IS_ACTIVE ($ext_name) {
        // Extensions are all inactive during installation
-       if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false;
+       if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling()) || (empty($ext_name))) return false;
 
        // Not active is the default
        $active = "N";
@@ -369,7 +369,7 @@ function GET_EXT_VERSION ($ext_name) {
        $ext_ver = false;
 
        // Extensions are all inactive during installation
-       if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
+       if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling())) return "";
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ext_name={$ext_name}");
 
        // Is the cache written?