makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12786] Array_merge instead copy array parts

Browse source 
nickvergessen proposed this

PHPBB3-12786
This commit is contained in:
Stanislav Atanasov 2014-07-04 14:17:29 +03:00
parent c9da9ec858
commit 4cec5bcd55
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/db/migration/profilefield_base_migration.php
View file

@ -135,13 +135,10 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration
{ {
foreach ($this->profilefield_language_data as $language_data) foreach ($this->profilefield_language_data as $language_data)
{ {
$insert_buffer->insert(array( $insert_buffer->insert(array_merge(array(
'field_id' => $field_id, 'field_id' => $field_id,
'lang_id' => $lang_id, 'lang_id' => $lang_id,
'option_id' => $language_data['option_id'], ), $language_data));
'field_type' => $language_data['field_type'],
'lang_value' => $language_data['lang_value'],
));
} }
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);