diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-04-03 16:02:50 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-04-03 16:02:50 +0200 |
| commit | 8769e765a2e3cb4fb78d4f9d66e6e72bff9a0649 (patch) | |
| tree | a2cc27e8f8b6228f9d74923df1451344b00e1b86 /phpBB/phpbb/db | |
| parent | 5ba5128ae6c3a03045745749120ab274090e0885 (diff) | |
| parent | a2f517fb38b41a3390b1b72ec11ea7cfeba254ec (diff) | |
| download | forums-8769e765a2e3cb4fb78d4f9d66e6e72bff9a0649.tar forums-8769e765a2e3cb4fb78d4f9d66e6e72bff9a0649.tar.gz forums-8769e765a2e3cb4fb78d4f9d66e6e72bff9a0649.tar.bz2 forums-8769e765a2e3cb4fb78d4f9d66e6e72bff9a0649.tar.xz forums-8769e765a2e3cb4fb78d4f9d66e6e72bff9a0649.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14532] Do not escape column default in mssql
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/tools/mssql.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/tools/mssql.php b/phpBB/phpbb/db/tools/mssql.php index a90a85bbb2..87719acd21 100644 --- a/phpBB/phpbb/db/tools/mssql.php +++ b/phpBB/phpbb/db/tools/mssql.php @@ -605,7 +605,7 @@ class mssql extends tools if (!empty($column_data['default'])) { // Add new default value constraint - $statements[] = 'ALTER TABLE [' . $table_name . '] ADD CONSTRAINT [DF_' . $table_name . '_' . $column_name . '_1] ' . $this->db->sql_escape($column_data['default']) . ' FOR [' . $column_name . ']'; + $statements[] = 'ALTER TABLE [' . $table_name . '] ADD CONSTRAINT [DF_' . $table_name . '_' . $column_name . '_1] ' . $column_data['default'] . ' FOR [' . $column_name . ']'; } if (!empty($indexes)) |