From 666cdec516655603e1a83ff884faa9c6e58b7ace Mon Sep 17 00:00:00 2001
From: Michael Klier <chi@chimeric.de>
Date: Fri, 16 Jan 2009 23:54:28 +0100
Subject: fix for FS#1534

darcs-hash:20090116225428-23886-2ce4d48a20f66265764c95b19ee505c6519446e2.gz
---
 lib/exe/mediamanager.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'lib/exe/mediamanager.php')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 97afae9b7..091e52050 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -77,7 +77,19 @@
 
     // handle deletion
     if($DEL) {
-        $INUSE = media_delete($DEL,$AUTH);
+        $INUSE = media_inuse($DEL);
+        if(!$INUSE) {
+            if(media_delete($DEL,$AUTH)) {
+			    msg(str_replace('%s',noNS($id),$lang['deletesucc']),1);
+            } else {
+         	    msg(str_replace('%s',noNS($DEL),$lang['deletefail']),-1);
+            }
+		} else {
+            if(!$conf['refshow']) {
+                unset($INUSE);
+                msg(str_replace('%s',noNS($DEL),$lang['mediainuse']),0);
+            }
+        }
     }
 
     // finished - start output
-- 
cgit v1.2.3