diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4e4b2a547c..18eb870a3d 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/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>
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index d23d1866c1..4382d891d0 100644
--- a/phpBB/includes/db/firebird.php
+++ b/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;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index b222588cf2..79586c343d 100644
--- a/phpBB/includes/db/mssql.php
+++ b/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;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 7722f79952..30660a2652 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/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;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 2d689f86f9..5c8d08b19d 100644
--- a/phpBB/includes/db/mysql.php
+++ b/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;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 32765d15f7..6041320c7e 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/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;
 	}
 
 	/**
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index a63c06e5c0..d31803dad2 100644
--- a/phpBB/includes/db/oracle.php
+++ b/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;
 	}
 
 	/**
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index bb689a7394..b214533f9d 100644
--- a/phpBB/includes/db/postgres.php
+++ b/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;
 	}
 
 	/**
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 5ae36df4f5..3acb777c82 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/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;
 	}
 
 	/**