Use the isImage function in the media helper (#153)

* Use the isImage function in the media helper * Check mime type first
joomla · Apr 3, 2017 · 5f974c2 · 5f974c2
1 parent ae7da39
commit 5f974c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/administrator/components/com_media/libraries/media/file/adapter/local.php b/administrator/components/com_media/libraries/media/file/adapter/local.php
@@ -283,7 +283,7 @@ private function getPathInformation($path)
 		$obj->width                   = 0;
 		$obj->height                  = 0;
 
-		if (strpos($obj->mime_type, 'image/') === 0 && in_array(strtolower($obj->extension), array('jpg', 'jpeg', 'png', 'gif', 'bmp')))
+		if (strpos($obj->mime_type, 'image/') === 0 && JHelperMedia::isImage($obj->name))
 		{
 			// Get the image properties
 			$props       = JImage::getImageFileProperties($path);

diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
@@ -25,9 +25,9 @@ class JHelperMedia
 	 *
 	 * @since   3.2
 	 */
-	public function isImage($fileName)
+	public static function isImage($fileName)
 	{
-		static $imageTypes = 'xcf|odg|gif|jpg|png|bmp';
+		static $imageTypes = 'xcf|odg|gif|jpg|jpeg|png|bmp';
 
 		return preg_match("/\.(?:$imageTypes)$/i", $fileName);
 	}