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/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
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/controllers/PluploadController.php
View file

@ -27,9 +27,10 @@ class PluploadController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet($baseUrl.'css/addmedia.css?'.$CC_CONFIG['airtime_version']);
$this->view->quotaLimitReached = false;
if (Application_Model_Systemstatus::isDiskOverQuota()) {
// temporarily disabling disk quota until all file size values have been set
/*if (Application_Model_Systemstatus::isDiskOverQuota()) {
$this->view->quotaLimitReached = true;
}
}*/
//Because uploads are done via AJAX (and we're not using Zend form for those), we manually add the CSRF
//token in here.