Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

This commit is contained in:
drigato 2014-04-14 12:14:02 -04:00
commit e8cf288d5d
1 changed files with 2 additions and 10 deletions

View File

@ -120,10 +120,10 @@ class Rest_MediaController extends Zend_Rest_Controller
return;
}
if (!$this->isDiskOverQuota()) {
if (Application_Model_Systemstatus::isDiskOverQuota()) {
$this->getResponse()
->setHttpResponseCode(400)
->appendBody("ERROR: Disk Quota limit reached.");
->appendBody("ERROR: Disk Quota reached.");
return;
}
@ -430,13 +430,5 @@ class Rest_MediaController extends Zend_Rest_Controller
return $response;
}
private function isDiskOverQuota()
{
if (Application_Model_Systemstatus::isDiskOverQuota()) {
return true;
}
return false;
}
}