Merge branch 'master' into develop

This commit is contained in:
jgen
2015-05-31 22:43:49 -07:00
2 changed files with 3 additions and 7 deletions

View File

@@ -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;