From ddaf00492dd005c8c04a36953431bd4a7c75f315 Mon Sep 17 00:00:00 2001 From: azaozz Date: Mon, 6 Apr 2009 22:37:51 +0000 Subject: [PATCH] Fix confirmation for second bulk delete, fixes #9473 for 2.7.2 git-svn-id: http://svn.automattic.com/wordpress/branches/2.7@10882 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/categories.php | 2 +- wp-admin/edit-comments.php | 2 +- wp-admin/edit-link-categories.php | 2 +- wp-admin/edit-pages.php | 2 +- wp-admin/edit-tags.php | 2 +- wp-admin/edit.php | 2 +- wp-admin/link-manager.php | 2 +- wp-admin/upload.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wp-admin/categories.php b/wp-admin/categories.php index e704248025..3e52a5bc3e 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -294,7 +294,7 @@ if ( $page_links ) (function($){ $(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 = ''; return showNotice.warn(m); } diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 43eecffc87..2168d08f3f 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -378,7 +378,7 @@ if ( $page_links ) (function($){ $(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 = ''; return showNotice.warn(m); } diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index 3636635cac..11b6415c58 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -229,7 +229,7 @@ if ( $page_links ) (function($){ $(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 = ''; return showNotice.warn(m); } diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index fd817e3ad1..20373eb866 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -317,7 +317,7 @@ endif; // posts; (function($){ $(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 = ''; return showNotice.warn(m); } diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 79fddf6914..25e3f9e900 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -292,7 +292,7 @@ else (function($){ $(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 = ''; return showNotice.warn(m); } diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 9d148a81a8..d2f4b7b63a 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -301,7 +301,7 @@ if ( $page_links ) (function($){ $(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 = ''; return showNotice.warn(m); } diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index d596b113fd..256ef9aac9 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -275,7 +275,7 @@ if ( $links ) { (function($){ $(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 = ''; return showNotice.warn(m); } diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 7b57f6495c..23777f976e 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -415,7 +415,7 @@ if ( $page_links ) (function($){ $(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 = ''; return showNotice.warn(m); } else if ( $('select[name^="action"]').val() == 'attach' ) {