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

Merged 2.5.x into saas

Browse source
This commit is contained in:
Duncan Sommerville 2014-11-10 09:08:03 -05:00
commit af8c6c2f48
21 changed files with 1111 additions and 1055 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/ApiController.php
View file

@ -845,7 +845,7 @@ class ApiController extends Zend_Controller_Action
//File is not in database anymore.
if (is_null($file)) {
$return_hash['error'] = _("File does not exist in Airtime.");
$return_hash['error'] = sprintf(_("File does not exist in %s"), PRODUCT_NAME);
}
//Updating a metadata change.
else {
@ -865,7 +865,7 @@ class ApiController extends Zend_Controller_Action
$md['MDATA_KEY_ORIGINAL_PATH'], $con);
if (is_null($file)) {
$return_hash['error'] = _('File does not exist in Airtime');
$return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME);
} else {
$filepath = $md['MDATA_KEY_FILEPATH'];
//$filepath = str_replace("\\", "", $filepath);
@ -877,7 +877,7 @@ class ApiController extends Zend_Controller_Action
$file = Application_Model_StoredFile::RecallByFilepath($filepath, $con);
if (is_null($file)) {
$return_hash['error'] = _("File doesn't exist in Airtime.");
$return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME);
Logging::warn("Attempt to delete file that doesn't exist.
Path: '$filepath'");
} else {