diff options
| author | David Rothstein <drothstein@gmail.com> | 2015-08-19 17:22:37 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2015-08-19 17:22:37 -0400 |
| commit | 731dfacab8bf39918c135bf4939e56a76dc6ab34 (patch) | |
| tree | 7febc850df6d6f4ebc82073376f4041c300abfb7 /includes/database | |
| parent | 11cc2b0251d705b5bed981368fee038e5dddb0d1 (diff) | |
| parent | be00a1ced4104d84df2f34b149b35fb0adf91093 (diff) | |
| download | brdo-731dfacab8bf39918c135bf4939e56a76dc6ab34.tar.gz brdo-731dfacab8bf39918c135bf4939e56a76dc6ab34.tar.bz2 | |
Merge tag '7.39' into 7.x
7.39 release
Conflicts:
CHANGELOG.txt
includes/bootstrap.inc
Diffstat (limited to 'includes/database')
| -rw-r--r-- | includes/database/database.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index 01b638584..3d776b573 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -626,7 +626,7 @@ abstract class DatabaseConnection extends PDO { * A sanitized version of the query comment string. */ protected function filterComment($comment = '') { - return preg_replace('/(\/\*\s*)|(\s*\*\/)/', '', $comment); + return strtr($comment, array('*' => ' * ')); } /** |