Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SAAS-922 take 2

Browse source
This commit is contained in:
Albert Santoni 2015-07-15 13:12:56 -04:00
parent 934b3fb764
commit ffb55de566
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/models/airtime/CcFiles.php
View file

@ -363,14 +363,6 @@ class CcFiles extends BaseCcFiles {
unset($response[$key]);
}
$mime = $file->getDbMime();
if (!empty($mime)) {
// Get an extension based on the file's mime type and change the path to use this extension
$path = pathinfo($file->getDbFilepath());
$ext = FileDataHelper::getFileExtensionFromMime($mime);
$response["filepath"] = ($path["dirname"] . '/' . $path["filename"] . $ext);
}
return $response;
}
@ -385,8 +377,12 @@ class CcFiles extends BaseCcFiles {
public function getFilename()
{
$info = pathinfo($this->getAbsoluteFilePath());
//filename doesn't contain the extension because PHP is awful
return $info['filename'].".".$info['extension'];
$mime = $this->getDbMime();
$extension = FileDataHelper::getFileExtensionFromMime($mime);
return $info['filename'].".".$extension;
}
/**