Merge branch 'saas' into saas-media-refactor

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
Albert Santoni 2015-02-26 13:10:13 -05:00
commit ab6d83f49d
5 changed files with 22 additions and 20 deletions

View file

@ -392,7 +392,7 @@ SQL;
Logging::info("User ".$user->getLogin()." is deleting file: ".$this->_file->getDbTrackTitle()." - file id: ".$file_id);
$filesize = $this->_file->getFileSize();
if ($filesize <= 0) {
if ($filesize < 0) {
throw new Exception("Cannot delete file with filesize ".$filesize);
}