summaryrefslogtreecommitdiff
path: root/includes/database/pgsql
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2011-05-22 09:08:19 -0400
committerDries Buytaert <dries@buytaert.net>2011-05-22 09:08:19 -0400
commit5dbe8aa92b9e746962b43f9a24b10d7f9616d232 (patch)
tree3a99baca5a9f27bb3914ef9ee082eb4d2d6d84fc /includes/database/pgsql
parentc88f2e0188e48f4c4adfb101d70733a0b27d4685 (diff)
parent267b9c435c5d7266f4ce674b84d95bfe1f5a0920 (diff)
downloadbrdo-5dbe8aa92b9e746962b43f9a24b10d7f9616d232.tar.gz
brdo-5dbe8aa92b9e746962b43f9a24b10d7f9616d232.tar.bz2
Merge branch '7.x' of git.drupal.org:project/drupal into 7.x
Diffstat (limited to 'includes/database/pgsql')
-rw-r--r--includes/database/pgsql/query.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/database/pgsql/query.inc b/includes/database/pgsql/query.inc
index fe7909e17..f3783a9ca 100644
--- a/includes/database/pgsql/query.inc
+++ b/includes/database/pgsql/query.inc
@@ -103,8 +103,8 @@ class InsertQuery_pgsql extends InsertQuery {
}
public function __toString() {
- // Create a comments string to prepend to the query.
- $comments = (!empty($this->comments)) ? '/* ' . implode('; ', $this->comments) . ' */ ' : '';
+ // Create a sanitized comment string to prepend to the query.
+ $comments = $this->connection->makeComment($this->comments);
// Default fields are always placed first for consistency.
$insert_fields = array_merge($this->defaultFields, $this->insertFields);