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

Wrong mimetype returned by getMimeType from Magento library #716 #717

Closed
wants to merge 4 commits into from
Closed

Wrong mimetype returned by getMimeType from Magento library #716 #717

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a516e1a
Optimization on Weee tax calculation
Jan 8, 2014
796e984
Merge remote-tracking branch 'upstream/master'
Oct 28, 2014
b900007
Fix for issue #716. Wrong mimetype returned by magento image library
Oct 28, 2014
fc17fac
Set back the right file
Oct 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,12 @@ public function __construct(\Magento\Framework\Filesystem $filesystem, array $da
* Assign image width, height, fileType and fileMimeType to object properties
* using getimagesize function
*
* @return int|null
* @return string
*/
public function getMimeType()
{
if ($this->_fileType) {
return $this->_fileType;
if ($this->_fileMimeType) {
return $this->_fileMimeType;
} else {
list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType, ) = getimagesize($this->_fileName);
$this->_fileMimeType = image_type_to_mime_type($this->_fileType);
Expand Down