diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-23 17:32:57 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-23 17:32:57 +0100 |
| commit | fc91616fadc19aaf6423c541c748c3fb3ec70760 (patch) | |
| tree | eecaf659aeb511753460f1d5300b6ca9829b45b6 /phpBB/phpbb/db/tools | |
| parent | bcf13551bee63417cce1cf030c016eeb8855b751 (diff) | |
| parent | 9cdbb69f9e50f665caad54fc93f64143cb7d8fc8 (diff) | |
| download | forums-fc91616fadc19aaf6423c541c748c3fb3ec70760.tar forums-fc91616fadc19aaf6423c541c748c3fb3ec70760.tar.gz forums-fc91616fadc19aaf6423c541c748c3fb3ec70760.tar.bz2 forums-fc91616fadc19aaf6423c541c748c3fb3ec70760.tar.xz forums-fc91616fadc19aaf6423c541c748c3fb3ec70760.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb/db/tools')
| -rw-r--r-- | phpBB/phpbb/db/tools/tools.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/tools/tools.php b/phpBB/phpbb/db/tools/tools.php index e1389a24bf..152ec6b00f 100644 --- a/phpBB/phpbb/db/tools/tools.php +++ b/phpBB/phpbb/db/tools/tools.php @@ -1526,7 +1526,15 @@ class tools implements tools_interface } else { - $default_val = "'" . $column_data[1] . "'"; + // Integers need to have 0 instead of empty string as default + if (strpos($column_type, 'INT') === 0) + { + $default_val = '0'; + } + else + { + $default_val = "'" . $column_data[1] . "'"; + } $return_array['null'] = 'NULL'; $sql .= 'NULL '; } |