From 25747314e2b923f90f44e69c896d3aa0e0087dce Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 8 Jan 2010 21:09:17 +0000
Subject: [PATCH] - Patch #550010 by c960657:
DatabaseConnection::prepareQuery() ignores argument.
---
includes/database/database.inc | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 98f3497aec61..53732a982c6b 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -455,11 +455,17 @@ public function prefixTables($sql) {
*/
public function prepareQuery($query, $cache = TRUE) {
$query = $this->prefixTables($query);
- if (empty($this->preparedStatements[$query])) {
+ if (isset($this->preparedStatements[$query])) {
+ $stmt = $this->preparedStatements[$query];
+ }
+ else {
// Call PDO::prepare.
- $this->preparedStatements[$query] = parent::prepare($query);
+ $stmt = parent::prepare($query);
+ if ($cache) {
+ $this->preparedStatements[$query] = $stmt;
+ }
}
- return $this->preparedStatements[$query];
+ return $stmt;
}
/**
--
GitLab