Merge pull request #409 from jgen/linting

Linting
This commit is contained in:
Shish
2014-04-20 00:29:53 +01:00
17 changed files with 93 additions and 75 deletions

View File

@ -279,6 +279,7 @@ class Upload extends Extension {
}
$pathinfo = pathinfo($file['name']);
$metadata = array();
$metadata['filename'] = $pathinfo['basename'];
$metadata['extension'] = $pathinfo['extension'];
$metadata['tags'] = $tags;
@ -349,6 +350,7 @@ class Upload extends Extension {
}else{
global $user;
$pathinfo = pathinfo($url);
$metadata = array();
$metadata['filename'] = $filename;
$metadata['extension'] = getExtension($headers['Content-Type']) ?: $pathinfo['extension'];
$metadata['tags'] = $tags;