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

Merge remote-tracking branch 'sf/2.2.x' into cc-4585

Browse source
This commit is contained in:
Rudi Grinberg 2012-11-05 09:19:20 -05:00
commit e01a61208d
3 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/LibraryController.php
View file

@ -321,7 +321,7 @@ class LibraryController extends Zend_Controller_Action
if (isset($file)) {
try {
$res = $file->delete(true);
$res = $file->delete();
} catch (FileNoPermissionException $e) {
$message = $noPermissionMsg;
} catch (Exception $e) {

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

@ -335,7 +335,7 @@ SQL;
* @param boolean $p_deleteFile
*
*/
public function delete($deleteFromPlaylist=false)
public function delete()
{
$filepath = $this->getFilePath();
@ -359,9 +359,6 @@ SQL;
Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data);
}
if ($deleteFromPlaylist) {
Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
}
// set file_exists falg to false
$this->_file->setDbHidden(true);
$this->_file->save();