Revert "Merge branch 'check_content_type' into 'dev'"

This reverts merge request !1453

1 files changed, 4 insertions, 7 deletions

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 608237ce1..9aeb2ef17 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -482,6 +482,7 @@ function guess_image_type($filename, $headers = '') {
 //	logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG);
 	$type = null;
 	if ($headers) {
+
 		$hdrs=array();
 		$h = explode("\n",$headers);
 		foreach ($h as $l) {
@@ -489,16 +490,11 @@ function guess_image_type($filename, $headers = '') {
 			$hdrs[strtolower($k)] = $v;
 		}
 		logger('Curl headers: '.var_export($hdrs, true), LOGGER_DEBUG);
-		if (array_key_exists('content-type', $hdrs)) {
+		if (array_key_exists('content-type', $hdrs))
 			$type = $hdrs['content-type'];
-
-			$ph = photo_factory('');
-			$types = $ph->supportedTypes();
-
-			$type = $types[$type];
-		}
 	}
 	if (is_null($type)){
+
 		$ignore_imagick = get_config('system', 'ignore_imagick');
 		// Guessing from extension? Isn't that... dangerous?
 		if(class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) {
@@ -642,6 +638,7 @@ function import_xchan_photo($photo,$xchan,$thing = false,$force = false) {
                         $img_str = $result['body'];
                         $type = guess_image_type($photo, $result['header']);
                         $modified = gmdate('Y-m-d H:i:s', (preg_match('/last-modified: (.+) \S+/i', $result['header'], $o) ? strtotime($o[1] . 'Z') : time()));
+
                         if(is_null($type))
                                 $photo_failure = true;
                 }