Don't throw error when using db_fetch_array on empty resultset

vincentsels · dregad · commit 9b1a282b239d · 2012-06-01T10:33:12.000+02:00
When you execute a query which returns no results, an error is thrown
when using db_fetch_array() on it, because the method tries to access
the EOF property of an object which in that case is null.

By adding an extra check on the passed p_result to see whether it is
null, you can safely use db_fetch_array for instance in while loops,
without having to always manually check whether or not the result has
rows. This makes code more readable and faster.

Fixes #14336

Signed-off-by: Damien Regad &lt;damien.regad@merckgroup.com&gt;
diff --git a/core/database_api.php b/core/database_api.php
@@ -450,7 +450,7 @@ function db_affected_rows() {
 function db_fetch_array( &$p_result ) {
 	global $g_db, $g_db_type;
 
-	if( $p_result->EOF ) {
+	if( is_null( $p_result ) || $p_result->EOF ) {
 		return false;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ function db_affected_rows() {`
`450`	`450`	`function db_fetch_array( &$p_result ) {`
`451`	`451`	`global $g_db, $g_db_type;`
`452`	`452`
`453`		`- if( $p_result->EOF ) {`
	`453`	`+ if( is_null( $p_result ) \|\| $p_result->EOF ) {`
`454`	`454`	`return false;`
`455`	`455`	`}`
`456`	`456`