X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=f531cb40e88894a34561b725c8e9c6c695c09cdf;hb=3e429bc72276003273046a3d903261b97ac51307;hp=4a21cc45aab05ce7c628814916e53d021cf6c0e6;hpb=b0693e1b6ee1f65dcb09dae6960dc3abe35c75e4;p=mailer.git

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 4a21cc45aa..f531cb40e8 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -239,7 +239,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
 				// Extension version set? If empty the extension is not registered
 				if (empty($ext_ver)) {
-					// Extension not registered so far so first load task's ID...
+					// Extension not registered so far so first load task's id...
 					$task = determineExtensionTaskId($ext_update);
 
 					// Entry found?
@@ -450,11 +450,10 @@ function isExtensionInstalled ($ext_name) {
 		// Extensions are all inactive/not installed during installation
 	} else {
 		// Look in database
-		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-			array($ext_name), __FILE__, __LINE__);
+		$ext_id = getExtensionId($ext_name);
 
 		// Do we have a record?
-		$isInstalled = (SQL_NUMROWS($result) == 1);
+		$isInstalled = ($ext_id > 0);
 
 		// Is it installed, then cache the entry
 		if ($isInstalled === true) {
@@ -462,9 +461,6 @@ function isExtensionInstalled ($ext_name) {
 			getExtensionId($ext_name, true);
 		} // END - if
 
-		// Free result
-		SQL_FREERESULT($result);
-
 		// Remember the status
 		$GLOBALS['ext_is_installed'][$ext_name] = $isInstalled;
 	}
@@ -770,7 +766,7 @@ function getExtensionName ($ext_id) {
 
 // Get extension id from name
 function getExtensionId ($ext_name, $forceDb = false) {
-	// Init ID number
+	// Init id number
 	$ret = 0;
 
 	if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
@@ -795,11 +791,9 @@ function getExtensionId ($ext_name, $forceDb = false) {
 
 		// Cache it
 		$GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $ret;
-	}
-
-	if ($ret == 0) {
-		// We should fix these all!
-		debug_report_bug(__FUNCTION__ . ': Invalid extension name found. ext_name=' . $ext_name);
+	} else {
+		// Caching enabled but no cache found is bad
+		debug_report_bug(__FUNCTION__ . ': Cache not found but ext-cache is active. ext_name=' . $ext_name);
 	} // END - if
 
 	// Return value
@@ -1009,7 +1003,7 @@ function determineExtensionTaskId ($ext_name) {
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
-		// Task found so load task's ID and register extension...
+		// Task found so load task's id and register extension...
 		list($task_id) = SQL_FETCHROW($result);
 	} // END - if
 
@@ -1031,7 +1025,7 @@ function determineTaskIdBySubject ($subject) {
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
-		// Task found so load task's ID and register extension...
+		// Task found so load task's id and register extension...
 		list($task_id) = SQL_FETCHROW($result);
 	} // END - if