diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-05-22 09:08:19 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-05-22 09:08:19 -0400 |
| commit | 5dbe8aa92b9e746962b43f9a24b10d7f9616d232 (patch) | |
| tree | 3a99baca5a9f27bb3914ef9ee082eb4d2d6d84fc /includes/database/select.inc | |
| parent | c88f2e0188e48f4c4adfb101d70733a0b27d4685 (diff) | |
| parent | 267b9c435c5d7266f4ce674b84d95bfe1f5a0920 (diff) | |
| download | brdo-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/select.inc')
| -rw-r--r-- | includes/database/select.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/includes/database/select.inc b/includes/database/select.inc index 6e4b0dc48..716c2fc3d 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -1439,9 +1439,8 @@ class SelectQuery extends Query implements SelectQueryInterface { } 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); // SELECT $query = $comments . 'SELECT '; |