james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only examine the headers if we actually have them.

Browse Source
This commit is contained in:
jgen 2015-05-31 21:39:22 -07:00
parent 718cfa0bcf
commit edc9e07919
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/upload/main.php
View File

@ -364,9 +364,10 @@ class Upload extends Extension {
$tmp_filename = tempnam(ini_get('upload_tmp_dir'), "shimmie_transload"); $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); $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); $h_filename = ($s_filename ? preg_replace('/^.*filename="([^ ]+)"/i', '$1', $s_filename) : null);
$filename = $h_filename ?: basename($url); $filename = $h_filename ?: basename($url);