From 4ffe79a2869aaf67fedce12a1eb91ddd16094d6b Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 31 Jan 2012 16:12:11 -0500
Subject: [PATCH] CC-3290: A file should be removed from playlists if it is
 removed  through the interface

- fixed
---
 airtime_mvc/application/controllers/LibraryController.php | 2 +-
 airtime_mvc/application/models/StoredFile.php             | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index d74104cd2..1068c403f 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -168,7 +168,7 @@ class LibraryController extends Zend_Controller_Action
                     return;
                 }
 
-                $res = $file->delete();
+                $res = $file->delete(true);
 
                 if (PEAR::isError($res)) {
                     $this->view->message = $res->getMessage();
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index d99058fa4..c51ea3dfd 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -303,7 +303,7 @@ class Application_Model_StoredFile {
      *
      * @return void|PEAR_Error
      */
-    public function delete()
+    public function delete($deleteFromPlaylist=false)
     {
         if ($this->exists()) {
             if ($this->getFormat() == 'audioclip') {
@@ -314,8 +314,9 @@ class Application_Model_StoredFile {
             }
         }
 
-        // don't delete from the playslist. We might want to put a flag
-        //Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
+        if($deleteFromPlaylist){
+            Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
+        }
         
         // set file_exists falg to false
         $this->_file->setDbFileExists(false);