X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=77568f03380826e86581249321a966a92d884ee8;hb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;hp=c7cc26c7fae8ee02da7c98dd0d3e0e6d7f889995;hpb=95ebee659171d4ad5ffd9ac55c1dbd68a90016fe;p=mailer.git

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index c7cc26c7fa..77568f0338 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -135,6 +135,9 @@ Query string:<br />
 
 // SQL num rows
 function SQL_NUMROWS ($result) {
+	// Valid link resource?
+	if (!SQL_IS_LINK_UP()) return false;
+
 	// Link is not up, no rows by default
 	$lines = false;
 
@@ -145,9 +148,9 @@ function SQL_NUMROWS ($result) {
 
 		// Is the result empty? Then we have an error!
 		if (empty($lines)) $lines = '0';
-	} elseif (SQL_IS_LINK_UP()) {
-		// No resource given, no lines found!
-		$lines = '0';
+	} else {
+		// No resource given, please fix this
+		trigger_error('No resource given! result[]=' . gettype($result));
 	}
 
 	// Return lines
@@ -403,14 +406,14 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 
 			// Do we have no entry on ADD or an entry on DROP?
 			// 123           4       4     3    3      4           4          32    23           4       4     3    3      4            4          321
-			if (((SQL_NUMROWS($result) == '0') && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
+			if (((SQL_HASZERONUMS($result)) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
 				// Do the query
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
 				$result = SQL_QUERY($sql, $F, $L, false);
 
 				// Skip further attempt(s)
 				break;
-			} elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == '0') && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
+			} elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_HASZERONUMS($result)) && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
 				// Abort here because it is alreay there
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql);
 				break;
@@ -545,5 +548,11 @@ function SQL_IS_LINK_UP () {
 	return $linkUp;
 }
 
+// Wrapper function to make code more readable
+function SQL_HASZERONUMS ($result) {
+	// Just pass it through
+	return (SQL_NUMROWS($result) === 0);
+}
+
 // [EOF]
 ?>