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

Merge branch 'saas' into saas-media-refactor

Browse source 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
Albert Santoni 2015-02-25 13:02:11 -05:00
commit 3a1141d4c8
42 changed files with 9042 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/StoredFile.php
View file

@ -564,7 +564,10 @@ SQL;
public function getFileSize()
{
$filesize = $this->_file->getFileSize();
if ($filesize <= 0) {
// It's OK for the file size to be zero. Pypo will make a request to Airtime and update
// the file size and md5 hash if they are not set.
if ($filesize < 0) {
throw new Exception ("Could not determine filesize for file id: ".$this->_file->getDbId().". Filesize: ".$filesize);
}
return $filesize;