Skip to content

Commit

Permalink
Chaging array_push call for array_merge, as the first one would produ…
Browse files Browse the repository at this point in the history
…ce worng nested arrays in MediaView. closes #391
  • Loading branch information
lorenzo committed Mar 17, 2010
1 parent 28cb57a commit c3aec39
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cake/libs/view/media.php
Expand Up @@ -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'
));
Expand Down

0 comments on commit c3aec39

Please sign in to comment.