t_a/cavepaintingsFork
1
Fork 0
forked from Cavemanon/cavepaintings
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-from-master

Browse Source 
Conflicts:
	ext/tag_list/theme.php
This commit is contained in:
jgen
2017-03-11 00:52:16 -08:00
parent ab9dc0c511 834bc740a4
commit ebab9eddeb
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/upload/main.php
View File

@@ -403,11 +403,14 @@ class Upload extends Extension {
$metadata['tags'] = $tags;
$metadata['source'] = (($url == $source) && !$config->get_bool('upload_tlsource') ? "" : $source);
$ext = false;
if (is_array($headers)) {
$metadata['extension'] = getExtension(findHeader($headers, 'Content-Type'));
} else {
$metadata['extension'] = $pathinfo['extension'];
$ext = getExtension(findHeader($headers, 'Content-Type'));
}
if ($ext === false) {
$ext = $pathinfo['extension'];
}
$metadata['extension'] = $ext;
/* check for locked > adds to metadata if it has */
if(!empty($locked)){