mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-20 10:18:54 +00:00
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
This commit is contained in:
commit
a715719415
1 changed files with 2 additions and 2 deletions
|
@ -422,7 +422,7 @@ class phpbb_functional_test_case extends phpbb_test_case
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$db->sql_multi_insert(STYLES_TABLE, array(
|
$db->sql_multi_insert(STYLES_TABLE, array(array(
|
||||||
'style_id' => $style_id,
|
'style_id' => $style_id,
|
||||||
'style_name' => $style_path,
|
'style_name' => $style_path,
|
||||||
'style_copyright' => '',
|
'style_copyright' => '',
|
||||||
|
@ -431,7 +431,7 @@ class phpbb_functional_test_case extends phpbb_test_case
|
||||||
'bbcode_bitfield' => 'kNg=',
|
'bbcode_bitfield' => 'kNg=',
|
||||||
'style_parent_id' => $parent_style_id,
|
'style_parent_id' => $parent_style_id,
|
||||||
'style_parent_tree' => $parent_style_path,
|
'style_parent_tree' => $parent_style_path,
|
||||||
));
|
)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue