From 6183fb05112cd318d9a6885d9405cff9917ee82f Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 8 Jul 2011 13:54:15 +0300
Subject: mediamanager fix

---
 lib/exe/mediamanager.php | 2 +-
 lib/scripts/media.js     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 77eb2facb..939b5a053 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -80,7 +80,7 @@
         $JUMPTO = media_metasave($IMG,$AUTH,$_REQUEST['meta']);
     }
 
-    if($IMG && $_REQUEST['mediado'] == 'save') {
+    if($IMG && ($_REQUEST['mediado'] == 'save' || @array_key_exists('save', $_REQUEST['mediado']))) {
         $JUMPTO = media_metasave($IMG,$AUTH,$_REQUEST['meta']);
     }
 
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 245519cbc..4eb1e7b63 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -405,6 +405,9 @@
 
         jQuery('div.success, div.info, div.error, div.notify').remove();
 
+        if (link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false;
+        if (link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false;
+
         content = $('#mediamanager__layout_detail');
         $('.scroll-container', content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
 
-- 
cgit v1.2.3