1 files changed, 9 insertions, 3 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 98f3497ae..53732a982 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -455,11 +455,17 @@ abstract class DatabaseConnection extends PDO {
    */
   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;
   }
 
   /**