Fix for issue magento#716. Wrong mimetype returned by magento image l…

…ibrary
Dorn- · Oct 28, 2014 · b900007 · b900007
1 parent 796e984
commit b900007
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
@@ -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);