From 0d7f8d474f5a5cdadf2a6878b377690353237745 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Fri, 16 Oct 2015 11:22:25 +0200
Subject: [PATCH] multi delete/move - submit by name

fixes notice messages on POST
---
 include/admin/images.inc.php        | 5 +++--
 templates/2k11/admin/media_pane.tpl | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index 705224a0..0c5a3965 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -116,11 +116,11 @@ switch ($serendipity['GET']['adminAction']) {
         if (!serendipity_checkFormToken()) {
             return; // blank content page, but default token check parameter is presenting a XSRF message when false
         }
-        if (!is_array($serendipity['POST']['multiDelete'])) {
+        if (!is_array($serendipity['POST']['multiDelete']) && isset($_POST['toggle_move'])) {
             echo '<div class="msg_notice"><span class="icon-attention-circled"></span> ' . sprintf(MULTICHECK_NO_ITEM, $_SERVER['HTTP_REFERER']) . '</div>'."\n";
             break;
         }
-        if (is_array($serendipity['POST']['multiDelete']) && isset($serendipity['POST']['oldDir']) && empty($serendipity['POST']['newDir'])) {
+        if (is_array($serendipity['POST']['multiDelete']) && isset($serendipity['POST']['oldDir']) && empty($serendipity['POST']['newDir']) && isset($_POST['toggle_move'])) {
             echo '<div class="msg_notice"><span class="icon-attention-circled"></span> ' . sprintf(MULTICHECK_NO_DIR, $_SERVER['HTTP_REFERER']) . '</div>'."\n";
             break;
         }
@@ -153,6 +153,7 @@ switch ($serendipity['GET']['adminAction']) {
             break;
         }
 
+        // case bulk multidelete
         $ids = '';
         $data['rip_image']        = array();
         $data['case_multidelete'] = true;
diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index 7925a71d..ddc70a24 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -227,7 +227,7 @@
 
         <div class="form_buttons">
             <input class="invert_selection" name="toggle" type="button" value="{$CONST.INVERT_SELECTIONS}">
-            <input class="state_cancel" name="toggle" type="submit" value="{$CONST.DELETE}">
+            <input class="state_cancel" name="toggle_delete" type="submit" value="{$CONST.DELETE}">
         </div>
         <hr>
         <div class="form_select">
@@ -244,7 +244,7 @@
                 </select>
         </div>
         <div class="form_buttons">
-            <input class="state_submit" name="toggle" type="submit" value="{$CONST.MOVE}">
+            <input class="state_submit" name="toggle_move" type="submit" value="{$CONST.MOVE}">
             <span class="media_file_actions actions"><a class="media_show_info button_link" href="#media_file_bulkmove" title="{$CONST.BULKMOVE}"><span class="icon-info-circled"></span><span class="visuallyhidden"> {$CONST.BULKMOVE}</span></a></span>
         </div>