aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Atanasov <lucifer@anavaro.com>2014-07-04 14:17:29 +0300
committerStanislav Atanasov <lucifer@anavaro.com>2014-07-04 14:49:23 +0300
commit4cec5bcd556e0edcf43bf25d628c552106e97b13 (patch)
tree52b284e26c7c7255642b9b47c4bf8a9a9df457d2
parentc9da9ec8587bc3e74e7a0f5a79a232865592f6ce (diff)
downloadforums-4cec5bcd556e0edcf43bf25d628c552106e97b13.tar
forums-4cec5bcd556e0edcf43bf25d628c552106e97b13.tar.gz
forums-4cec5bcd556e0edcf43bf25d628c552106e97b13.tar.bz2
forums-4cec5bcd556e0edcf43bf25d628c552106e97b13.tar.xz
forums-4cec5bcd556e0edcf43bf25d628c552106e97b13.zip
[ticket/12786] Array_merge instead copy array parts
nickvergessen proposed this PHPBB3-12786
-rw-r--r--phpBB/phpbb/db/migration/profilefield_base_migration.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/phpbb/db/migration/profilefield_base_migration.php b/phpBB/phpbb/db/migration/profilefield_base_migration.php
index 9bc789779b..578ce52d1c 100644
--- a/phpBB/phpbb/db/migration/profilefield_base_migration.php
+++ b/phpBB/phpbb/db/migration/profilefield_base_migration.php
@@ -135,13 +135,10 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration
{
foreach ($this->profilefield_language_data as $language_data)
{
- $insert_buffer->insert(array(
+ $insert_buffer->insert(array_merge(array(
'field_id' => $field_id,
'lang_id' => $lang_id,
- 'option_id' => $language_data['option_id'],
- 'field_type' => $language_data['field_type'],
- 'lang_value' => $language_data['lang_value'],
- ));
+ ), $language_data));
}
}
$this->db->sql_freeresult($result);