Changeset 10882

Timestamp:

04/06/2009 10:37:51 PM (16 years ago)

Author:

azaozz

Message:

Fix confirmation for second bulk delete, fixes #9473 for 2.7.2

Location:

branches/2.7/wp-admin

Files:

• categories.php (modified) (1 diff)
• edit-comments.php (modified) (1 diff)
• edit-link-categories.php (modified) (1 diff)
• edit-pages.php (modified) (1 diff)
• edit-tags.php (modified) (1 diff)
• edit.php (modified) (1 diff)
• link-manager.php (modified) (1 diff)
• upload.php (modified) (1 diff)

branches/2.7/wp-admin/categories.php

@@ -295 +295 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);

branches/2.7/wp-admin/edit-comments.php

@@ -379 +379 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected comments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);

branches/2.7/wp-admin/edit-link-categories.php

@@ -230 +230 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected link categories.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);

branches/2.7/wp-admin/edit-pages.php

@@ -318 +318 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected pages.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);

branches/2.7/wp-admin/edit-tags.php

@@ -293 +293 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected tags.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);

branches/2.7/wp-admin/edit.php

@@ -302 +302 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected posts.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);

branches/2.7/wp-admin/link-manager.php

@@ -276 +276 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected links.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);

branches/2.7/wp-admin/upload.php

@@ -416 +416 @@
     $(document).ready(function(){
         $('#doaction, #doaction2').click(function(e){
-            if ( $('select[name^="action"]').val() == 'delete' ) {
+            if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
                 var m = '<?php echo js_escape(__("You are about to delete the selected attachments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
                 return showNotice.warn(m);