Skip to content
Permalink
Browse files

Chaging array_push call for array_merge, as the first one would produ…

…ce worng nested arrays in MediaView. closes #391
  • Loading branch information...
lorenzo committed Mar 17, 2010
1 parent 28cb57a commit c3aec39d75a944c2105adbaba286049e03311f02
Showing with 1 addition and 1 deletion.
  1. +1 −1 cake/libs/view/media.php
@@ -148,7 +148,7 @@ function render() {
$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'
));

0 comments on commit c3aec39

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.