adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-03-17 10:47:03 -04:30
parent 0f876e1a1b
commit 93ac79d4fb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/view/media.php
View file

@ -154,7 +154,7 @@ class MediaView extends View {
$contentTypes[0] = 'application/octetstream'; $contentTypes[0] = 'application/octetstream';
} else if (preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) { } else if (preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) {
$contentTypes[0] = 'application/force-download'; $contentTypes[0] = 'application/force-download';
array_push($contentTypes, array( array_merge($contentTypes, array(
'application/octet-stream', 'application/octet-stream',
'application/download' 'application/download'
)); ));