From edc9e07919828888fc618b40c71e9cd34b25ac9d Mon Sep 17 00:00:00 2001 From: jgen Date: Sun, 31 May 2015 21:39:22 -0700 Subject: [PATCH] Only examine the headers if we actually have them. --- ext/upload/main.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/upload/main.php b/ext/upload/main.php index f0166008..c61bba1e 100644 --- a/ext/upload/main.php +++ b/ext/upload/main.php @@ -364,9 +364,10 @@ class Upload extends Extension { $tmp_filename = tempnam(ini_get('upload_tmp_dir'), "shimmie_transload"); + // transload() returns Array or Bool, depending on the transload_engine. $headers = transload($url, $tmp_filename); - - $s_filename = findHeader($headers, 'Content-Disposition'); + + $s_filename = is_array($headers) ? findHeader($headers, 'Content-Disposition') : null; $h_filename = ($s_filename ? preg_replace('/^.*filename="([^ ]+)"/i', '$1', $s_filename) : null); $filename = $h_filename ?: basename($url);