More debug infos

diff --git a/inc/config-functions.php b/inc/config-functions.php
index e045b45ca69aec3a30b765c8a73a3cd198891d2a..3148d37ff1ff0b5fa06fce7c4bfbd5f8f68b1e72 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -275,7 +275,7 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
        // Do not update config in CSS mode
        if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
                // This logger line may be very noisy
-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not updating configuration. entries[]=' . gettype($entries) . ',values[]=' . gettype($values) . ',updateMode=' . $updateMode . ',config=' . $config . ',isCssOutputMode()=' . intval(isCssOutputMode()) . ',isRawOutputMode()=' . intval(isRawOutputMode()) . 'isInstallationPhase()=' . intval(isInstallationPhase()));
+               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not updating configuration. entries[]=' . gettype($entries) . ',values[]=' . gettype($values) . ',updateMode=' . $updateMode . ',config=' . $config . ',isCssOutputMode()=' . intval(isCssOutputMode()) . ',isRawOutputMode()=' . intval(isRawOutputMode()) . ',isInstallationPhase()=' . intval(isInstallationPhase()));
                return;
        } // END - if
 

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 9768022912c8504bd2c735378ce5ce958eb9dbf3..d02cc8967c36ca8e9ac5ebcbf9f49c7bd4f05128 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -199,8 +199,8 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $ignoreUpdates
        // When this extension is already in registration/update phase, all is fine
        if ((isExtensionRegistrationRunning($ext_name)) || ((isExtensionUpdateRunning($ext_name)) && ($ignoreUpdates === false))) {
                // Then abort here with 'true' becaus it is fine
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in registration/update phase, all fine.');
-               ///* BUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . $taskId . ',dry_run=' . intval($dry_run) . ' - Please investigate!');
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in registration/update phase, all fine,taskId=' . $taskId . ',dry_run=' . intval($dry_run) . ',ignoreUpdates=' . intval($ignoreUpdates));
+               ///* BUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId=' . $taskId . ',dry_run=' . intval($dry_run) . ',ignoreUpdates=' . intval($ignoreUpdates) . ' - Please investigate!');
                return true;
        } // END - if
 
@@ -664,7 +664,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
        setCurrentExtensionName($ext_name);
 
        // Is this extension update already running?
-       if (isExtensionUpdateRunning($ext_name)) {
+       if ((isExtensionUpdateRunning($ext_name)) && ($dry_run === false)) {
                // This is fine but needs logging ATM
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - already in update phase, all fine.');
                return true;