mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-19 11:06:15 +00:00
Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391
This commit is contained in:
parent
28cb57a92c
commit
c3aec39d75
1 changed files with 1 additions and 1 deletions
|
@ -148,7 +148,7 @@ class MediaView extends View {
|
|||
$contentTypes[0] = 'application/octetstream';
|
||||
} else if (preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) {
|
||||
$contentTypes[0] = 'application/force-download';
|
||||
array_push($contentTypes, array(
|
||||
array_merge($contentTypes, array(
|
||||
'application/octet-stream',
|
||||
'application/download'
|
||||
));
|
||||
|
|
Loading…
Add table
Reference in a new issue