From 718cfa0bcf2355f17c8f5ac3ab8ef7d1215967dd Mon Sep 17 00:00:00 2001 From: jgen Date: Sun, 31 May 2015 21:28:11 -0700 Subject: [PATCH 1/3] Scrutinizer-ci has fixed this now. --- core/util.inc.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/util.inc.php b/core/util.inc.php index bed0794f..f32d8b1e 100644 --- a/core/util.inc.php +++ b/core/util.inc.php @@ -960,11 +960,6 @@ function transload($url, $mfile) { fwrite($fp, $data); fclose($fp); - // - // Scrutinizer-ci complains that $http_response_header does not exist, - // however, $http_response_header is actually a super-global. - // I have filed a bug with PHP-Analyzer here: https://github.com/scrutinizer-ci/php-analyzer/issues/212 - // $headers = http_parse_headers(implode("\n", $http_response_header)); return $headers; From edc9e07919828888fc618b40c71e9cd34b25ac9d Mon Sep 17 00:00:00 2001 From: jgen Date: Sun, 31 May 2015 21:39:22 -0700 Subject: [PATCH 2/3] 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); From 1c43fd9dc45fd877860b89e281a8a063b5ee49ca Mon Sep 17 00:00:00 2001 From: jgen Date: Mon, 1 Jun 2015 02:39:08 -0700 Subject: [PATCH 3/3] Remove duplicate 'class' attribute on html element. Fixed tag edit box so that auto complete works again. --- ext/tag_edit/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php index daf2c402..6fd47a14 100644 --- a/ext/tag_edit/theme.php +++ b/ext/tag_edit/theme.php @@ -49,7 +49,7 @@ class TagEditTheme extends Themelet { ".($user->can("edit_image_tag") ? " $h_tag_links - + " : " $h_tag_links ")."