From 106b18bf30f544fc261cbe2d53781ab5e7592eb1 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Fri, 2 Nov 2012 17:49:32 -0400
Subject: [PATCH] CC-4637: Media Library: Item will be removed from Playlist if
 it's removed from Library

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

diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 353d131f8..5bd5949de 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -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) {
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 2bd6470ea..51693f46d 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -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->setDbFileExists(false);
         $this->_file->save();