Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for EZP-20741: Allow default content disposition to be overridden #614

Merged
merged 3 commits into from Sep 24, 2013
Merged

Fix for EZP-20741: Allow default content disposition to be overridden #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d4291
Allow default content disposition to be overridden
peterkeung Apr 20, 2013
800e8d5
Remove redundant fallback
peterkeung Apr 20, 2013
f0fc287
Improve inline documentation
peterkeung Apr 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php
View file
Open in desktop
Expand Up @@ -83,7 +83,7 @@ function handleFileDownload( $contentObject, $contentObjectAttribute, $type,
* Checks if a file should be downloaded to disk or displayed inline in
* the browser.
*
* This method returns "attachment" if no setting for the mime type is found.
* Behavior by MIME type and default behavior are configured in file.ini
*
* @param string $mimetype
* @return string "attachment" or "inline"
Expand All @@ -98,7 +98,7 @@ protected static function dispositionType( $mimeType )
return $mimeTypes[$mimeType];
}

return "attachment";
return $ini->variable( 'PassThroughSettings', 'DefaultContentDisposition' );
}
}

Expand Down
1 change: 1 addition & 0 deletions settings/file.ini
View file
Open in desktop
Expand Up @@ -87,6 +87,7 @@ MaxCopyRetries=5
[PassThroughSettings]
# The default value for mime types not specified using ContentDisposition
# is "attachment". Possible values are attachment or inline.
DefaultContentDisposition=attachment
ContentDisposition[application/x-shockwave-flash]=inline
ContentDisposition[video/ogg]=inline
ContentDisposition[video/mp4]=inline
Expand Down