From: quix0r <quix0r@mxchange.org>
Date: Mon, 4 Jul 2011 02:32:01 +0000 (+0000)
Subject: Hopefully the final fixes
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=502916e99eb1d463c50ceaf2af1b6dda46f318d2;p=mailer.git

Hopefully the final fixes
---

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index fb21ed0c49..53619443ea 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -682,7 +682,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
 	initExtensionSqls();
 
 	// Check if version is updated
-	//* DEBUG: */ debugOutput(getCurrentExtensionName() . '/' . $ext_name . ':' . getThisExtensionVersion() . '/' . $ext_ver . '/' . intval(is_array($history)));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, getCurrentExtensionName() . '/' . $ext_name . ':' . getThisExtensionVersion() . '/' . $ext_ver . '/' . intval(is_array($history)));
 	if (((getThisExtensionVersion() != $ext_ver) || (isExtensionDryRun())) && (is_array($history))) {
 		// Search for starting point (-1 for making 0.0 -> 0.0.0 switch work)
 		$start = -1;
@@ -1312,10 +1312,11 @@ function isExtensionUpdateRunning ($ext_name) {
 		// Walk through whole array
 		foreach ($GLOBALS['ext_running_updates'] as $ext1=>$depends) {
 			// Is it found?
-			if ($ext1 == $ext_name) {
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',depends=' . print_r($depends, true));
+			if (($ext1 == $ext_name) || (in_array($ext_name, $depends))) {
 				// Found
 				$isRunning = true;
-				logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=' . intval($isRunning));
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=' . intval($isRunning));
 				break;
 			} // END - if
 		} // END - foreach