Correctly return results for nested cached queries (Bug #31445 - Patch by faw)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8758 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/docs/CHANGELOG.html

@@ -98,6 +98,7 @@
 		<li>[Change] Set headers to allow browsers to better cache attachments (Mylek pointed this out)</li>
 		<li>[Change] Hide parameters if they equal the default (Bug #31185)</li>
 		<li>[Change] Various improvements to group listings (Bugs #32155, #32145, #32085, #26675, #26265)</li>
+		<li>[Fix] Correctly return results for nested cached queries (Bug #31445 - Patch by faw).</li>
 
 
 </ul>

phpBB/includes/db/firebird.php

@@ -238,7 +238,7 @@ class dbal_firebird extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**

phpBB/includes/db/mssql.php

@@ -162,7 +162,7 @@ class dbal_mssql extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**

phpBB/includes/db/mssql_odbc.php

@@ -174,7 +174,7 @@ class dbal_mssql_odbc extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**

phpBB/includes/db/mysql.php

@@ -183,7 +183,7 @@ class dbal_mysql extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**

phpBB/includes/db/mysqli.php

@@ -163,7 +163,7 @@ class dbal_mysqli extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**

phpBB/includes/db/oracle.php

@@ -355,7 +355,7 @@ class dbal_oracle extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**

phpBB/includes/db/postgres.php

@@ -202,7 +202,7 @@ class dbal_postgres extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**

phpBB/includes/db/sqlite.php

@@ -135,7 +135,7 @@ class dbal_sqlite extends dbal
 			return false;
 		}
 
-		return ($this->query_result) ? $this->query_result : false;
+		return ($this->query_result !== false) ? $this->query_result : false;
 	}
 
 	/**