diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-10 14:23:09 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-10 14:23:09 +0100 |
| commit | b088bf864bf5827c1801c53c0af1b5a2f89f5b16 (patch) | |
| tree | 5ab11074bae8b5958c6b9195ed570f9d8448d295 /phpBB/phpbb/db/migration | |
| parent | 840ab75520726e4db689ab1a92de6c17d86b107b (diff) | |
| parent | 9b1b6bd47747bf077f6bd5dce69f366391f380c6 (diff) | |
| download | forums-b088bf864bf5827c1801c53c0af1b5a2f89f5b16.tar forums-b088bf864bf5827c1801c53c0af1b5a2f89f5b16.tar.gz forums-b088bf864bf5827c1801c53c0af1b5a2f89f5b16.tar.bz2 forums-b088bf864bf5827c1801c53c0af1b5a2f89f5b16.tar.xz forums-b088bf864bf5827c1801c53c0af1b5a2f89f5b16.zip | |
Merge remote-tracking branch 'Marc/ticket/12170' into develop
* Marc/ticket/12170:
[ticket/12170] Test for 12170
[ticket/12170] Assign schema keys in migration helper with data_depth 1
Diffstat (limited to 'phpBB/phpbb/db/migration')
| -rw-r--r-- | phpBB/phpbb/db/migration/helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/helper.php b/phpBB/phpbb/db/migration/helper.php index 28a6a56511..009ad1da9f 100644 --- a/phpBB/phpbb/db/migration/helper.php +++ b/phpBB/phpbb/db/migration/helper.php @@ -53,7 +53,7 @@ class helper $steps[] = array( 'dbtools.perform_schema_changes', array(array( $change_type => array( - $value, + (!is_int($key)) ? $key : 0 => $value, ), )), ); |