aboutsummaryrefslogtreecommitdiffstats
path: root/include/photo
diff options
context:
space:
mode:
Diffstat (limited to 'include/photo')
-rw-r--r--include/photo/photo_driver.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 38210ba26..ba95266f9 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -473,19 +473,19 @@ abstract class photo_driver {
* @arg $fromcurl boolean Check Content-Type header from curl request
*/
-function guess_image_type($filename, $fromcurl=false) {
+function guess_image_type($filename, $headers = '') {
logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
$type = null;
- if ($fromcurl) {
+ if ($headers) {
$a = get_app();
- $headers=array();
- $h = explode("\n",$a->get_curl_headers());
+ $hdrs=array();
+ $h = explode("\n",$headers);
foreach ($h as $l) {
list($k,$v) = array_map("trim", explode(":", trim($l), 2));
- $headers[$k] = $v;
+ $hdrs[$k] = $v;
}
- if (array_key_exists('Content-Type', $headers))
- $type = $headers['Content-Type'];
+ if (array_key_exists('Content-Type', $hdrs))
+ $type = $hdrs['Content-Type'];
}
if (is_null($type)){
// FIXME!!!!