Changeset 12317

Timestamp:

12/03/2009 01:43:49 AM (16 years ago)

Author:

azaozz

Message:

Fix errors when bulk actions executed on empty list, props nacin, see #11184

Location:

trunk

Files:

• wp-admin/categories.php (modified) (4 diffs)
• wp-admin/edit-link-categories.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (2 diffs)
• wp-admin/js/inline-edit-post.dev.js (modified) (3 diffs)
• wp-admin/js/inline-edit-post.js (modified) (1 diff)
• wp-admin/link-manager.php (modified) (2 diffs)
• wp-admin/plugins.php (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/categories.php

@@ -35 +35 @@
 
 case 'delete':
+    if ( !isset( $_GET['cat_ID'] ) ) {
+        wp_redirect('categories.php');
+        exit;
+    }
+
     $cat_ID = (int) $_GET['cat_ID'];
     check_admin_referer('delete-category_' .  $cat_ID);
@@ -41 +46 @@
         wp_die(__('Cheatin’ uh?'));
 
-    $cat_name = get_cat_name($cat_ID);
-
     // Don't delete the default cats.
     if ( $cat_ID == get_option('default_category') )
-        wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+        wp_die( sprintf( __("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
 
     wp_delete_category($cat_ID);
@@ -60 +63 @@
         wp_die( __('You are not allowed to delete categories.') );
 
-    foreach ( (array) $_GET['delete'] as $cat_ID ) {
-        $cat_name = get_cat_name($cat_ID);
-
-        // Don't delete the default cats.
-        if ( $cat_ID == get_option('default_category') )
-            wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+    $cats = (array) $_GET['delete'];
+    $default_cat = get_option('default_category');
+    foreach ( $cats as $cat_ID ) {
+        $cat_ID = (int) $cat_ID;
+
+        // Don't delete the default cat.
+        if ( $cat_ID == $default_cat )
+            wp_die( sprintf( __("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
 
         wp_delete_category($cat_ID);
@@ -71 +76 @@
 
     wp_safe_redirect( wp_get_referer() );
-    exit();
+    exit;
 
 break;

trunk/wp-admin/edit-link-categories.php

@@ -19 +19 @@
 
     if ( 'delete' == $doaction ) {
-        foreach( (array) $_GET['delete'] as $cat_ID ) {
-            $cat_name = get_term_field('name', $cat_ID, 'link_category');
-            $default_cat_id = get_option('default_link_category');
-
+        $cats = (array) $_GET['delete'];
+        $default_cat_id = get_option('default_link_category');
+
+        foreach( $cats as $cat_ID ) {
+            $cat_ID = (int) $cat_ID;
             // Don't delete the default cats.
             if ( $cat_ID == $default_cat_id )
-                wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+                wp_die( sprintf( __("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), get_term_field('name', $cat_ID, 'link_category') ) );
 
             wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));

trunk/wp-admin/edit-tags.php

@@ -45 +45 @@
 
 case 'delete':
+    if ( !isset( $_GET['tag_ID'] ) ) {
+        wp_redirect("edit-tags.php?taxonomy=$taxonomy");
+        exit;
+    }
+
     $tag_ID = (int) $_GET['tag_ID'];
     check_admin_referer('delete-tag_' .  $tag_ID);
@@ -71 +76 @@
         wp_die(__('Cheatin’ uh?'));
 
-    $tags = $_GET['delete_tags'];
-    foreach( (array) $tags as $tag_ID ) {
+    $tags = (array) $_GET['delete_tags'];
+    foreach( $tags as $tag_ID ) {
         wp_delete_term( $tag_ID, $taxonomy);
     }

trunk/wp-admin/js/inline-edit-post.dev.js

@@ -75 +75 @@
 
     setBulk : function() {
-        var te = '', type = this.type, tax;
+        var te = '', type = this.type, tax, c = true;
         this.revert();
 
@@ -84 +84 @@
         $('tbody th.check-column input[type="checkbox"]').each(function(i){
             if ( $(this).attr('checked') ) {
+                c = false;
                 var id = $(this).val(), theTitle;
                 theTitle = $('#inline_'+id+' .post_title').text() || inlineEditL10n.notitle;
@@ -89 +90 @@
             }
         });
+
+        if ( c )
+            return this.revert();
 
         $('#bulk-titles').html(te);

trunk/wp-admin/js/inline-edit-post.js

@@ -1 @@
-(function($){inlineEditPost={init:function(){var t=this,qeRow=$("#inline-edit"),bulkRow=$("#bulk-edit");t.type=$("table.widefat").hasClass("page")?"page":"post";t.what="#"+t.type+"-";qeRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});bulkRow.keyup(function(e){if(e.which==27){return inlineEditPost.revert()}});$("a.cancel",qeRow).click(function(){return inlineEditPost.revert()});$("a.save",qeRow).click(function(){return inlineEditPost.save(this)});$("td",qeRow).keydown(function(e){if(e.which==13){return inlineEditPost.save(this)}});$("a.cancel",bulkRow).click(function(){return inlineEditPost.revert()});$("#inline-edit .inline-edit-private input[value=private]").click(function(){var pw=$("input.inline-edit-password-input");if($(this).attr("checked")){pw.val("").attr("disabled","disabled")}else{pw.attr("disabled","")}});$("a.editinline").live("click",function(){inlineEditPost.edit(this);return false});$("#bulk-title-div").parents("fieldset").after($("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend($("#inline-edit label.inline-edit-tags").clone());$("span.catshow").click(function(){$(".inline-editor ul.cat-checklist").addClass("cat-hover");$(".inline-editor span.cathide").show();$(this).hide()});$("span.cathide").click(function(){$(".inline-editor ul.cat-checklist").removeClass("cat-hover");$(".inline-editor span.catshow").show();$(this).hide()});$('select[name="_status"] option[value="future"]',bulkRow).remove();$("#doaction, #doaction2").click(function(e){var n=$(this).attr("id").substr(2);if($('select[name="'+n+'"]').val()=="edit"){e.preventDefault();t.setBulk()}else{if($("form#posts-filter tr.inline-editor").length>0){t.revert()}}});$("#post-query-submit").click(function(e){if($("form#posts-filter tr.inline-editor").length>0){t.revert()}})},toggle:function(el){var t=this;$(t.what+t.getId(el)).css("display")=="none"?t.revert():t.edit(el)},setBulk:function(){var te="",type=this.type,tax;this.revert();$("#bulk-edit td").attr("colspan",$(".widefat:first thead th:visible").length);$("table.widefat tbody").prepend($("#bulk-edit"));$("#bulk-edit").addClass("inline-editor").show();$('tbody th.check-column input[type="checkbox"]').each(function(i){if($(this).attr("checked")){var id=$(this).val(),theTitle;theTitle=$("#inline_"+id+" .post_title").text()||inlineEditL10n.notitle;te+='<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+"</div>"}});$("#bulk-titles").html(te);$("#bulk-titles a").click(function(){var id=$(this).attr("id").substr(1);$('table.widefat input[value="'+id+'"]').attr("checked","");$("#ttle"+id).remove()});if(type=="post"){tax="post_tag";$('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+tax,{delay:500,minchars:2,multiple:true,multipleSep:", "})}},edit:function(id){var t=this,fields,editRow,rowData,cats,status,pageOpt,f,pageLevel,nextPage,pageLoop=true,nextLevel,tax;t.revert();if(typeof(id)=="object"){id=t.getId(id)}fields=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password"];if(t.type=="page"){fields.push("post_parent","menu_order","page_template")}if(t.type=="post"){fields.push("tags_input")}editRow=$("#inline-edit").clone(true);$("td",editRow).attr("colspan",$(".widefat:first thead th:visible").length);if($(t.what+id).hasClass("alternate")){$(editRow).addClass("alternate")}$(t.what+id).hide().after(editRow);rowData=$("#inline_"+id);if(!$(':input[name="post_author"] option[value='+$(".post_author",rowData).text()+"]",editRow).val()){$(':input[name="post_author"]',editRow).prepend('<option value="'+$(".post_author",rowData).text()+'">'+$("#"+t.type+"-"+id+" .author").text()+"</option>")}for(f=0;f<fields.length;f++){$(':input[name="'+fields[f]+'"]',editRow).val($("."+fields[f],rowData).text())}if($(".comment_status",rowData).text()=="open"){$('input[name="comment_status"]',editRow).attr("checked","checked")}if($(".ping_status",rowData).text()=="open"){$('input[name="ping_status"]',editRow).attr("checked","checked")}if($(".sticky",rowData).text()=="sticky"){$('input[name="sticky"]',editRow).attr("checked","checked")}if(cats=$(".post_category",rowData).text()){$("ul.cat-checklist :checkbox",editRow).val(cats.split(","))}status=$("._status",rowData).text();if(status!="future"){$('select[name="_status"] option[value="future"]',editRow).remove()}if(status=="private"){$('input[name="keep_private"]',editRow).attr("checked","checked");$("input.inline-edit-password-input").val("").attr("disabled","disabled")}pageOpt=$('select[name="post_parent"] option[value="'+id+'"]',editRow);if(pageOpt.length>0){pageLevel=pageOpt[0].className.split("-")[1];nextPage=pageOpt;while(pageLoop){nextPage=nextPage.next("option");if(nextPage.length==0){break}nextLevel=nextPage[0].className.split("-")[1];if(nextLevel<=pageLevel){pageLoop=false}else{nextPage.remove();nextPage=pageOpt}}pageOpt.remove()}$(editRow).attr("id","edit-"+id).addClass("inline-editor").show();$(".ptitle",editRow).focus();if(t.type=="post"){tax="post_tag";$('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+tax,{delay:500,minchars:2,multiple:true,multipleSep:", "})}return false},save:function(id){var params,fields,page=$(".post_status_page").val()||"";if(typeof(id)=="object"){id=this.getId(id)}$("table.widefat .inline-edit-save .waiting").show();params={action:"inline-save",post_type:this.type,post_ID:id,edit_date:"true",post_status:page};fields=$("#edit-"+id+" :input").serialize();params=fields+"&"+$.param(params);$.post("admin-ajax.php",params,function(r){$("table.widefat .inline-edit-save .waiting").hide();if(r){if(-1!=r.indexOf("<tr")){$(inlineEditPost.what+id).remove();$("#edit-"+id).before(r).remove();$(inlineEditPost.what+id).hide().fadeIn()}else{r=r.replace(/<.[^<>]*?>/g,"");$("#edit-"+id+" .inline-edit-save").append('<span class="error">'+r+"</span>")}}else{$("#edit-"+id+" .inline-edit-save").append('<span class="error">'+inlineEditL10n.error+"</span>")}},"html");return false},revert:function(){var id;if(id=$("table.widefat tr.inline-editor").attr("id")){$("table.widefat .inline-edit-save .waiting").hide();if("bulk-edit"==id){$("table.widefat #bulk-edit").removeClass("inline-editor").hide();$("#bulk-titles").html("");$("#inlineedit").append($("#bulk-edit"))}else{$("#"+id).remove();id=id.substr(id.lastIndexOf("-")+1);$(this.what+id).show()}}return false},getId:function(o){var id=o.tagName=="TR"?o.id:$(o).parents("tr").attr("id"),parts=id.split("-");return parts[parts.length-1]}};$(document).ready(function(){inlineEditPost.init()})})(jQuery);
+(function(a){inlineEditPost={init:function(){var c=this,d=a("#inline-edit"),b=a("#bulk-edit");c.type=a("table.widefat").hasClass("page")?"page":"post";c.what="#"+c.type+"-";d.keyup(function(f){if(f.which==27){return inlineEditPost.revert()}});b.keyup(function(f){if(f.which==27){return inlineEditPost.revert()}});a("a.cancel",d).click(function(){return inlineEditPost.revert()});a("a.save",d).click(function(){return inlineEditPost.save(this)});a("td",d).keydown(function(f){if(f.which==13){return inlineEditPost.save(this)}});a("a.cancel",b).click(function(){return inlineEditPost.revert()});a("#inline-edit .inline-edit-private input[value=private]").click(function(){var e=a("input.inline-edit-password-input");if(a(this).attr("checked")){e.val("").attr("disabled","disabled")}else{e.attr("disabled","")}});a("a.editinline").live("click",function(){inlineEditPost.edit(this);return false});a("#bulk-title-div").parents("fieldset").after(a("#inline-edit fieldset.inline-edit-categories").clone()).siblings("fieldset:last").prepend(a("#inline-edit label.inline-edit-tags").clone());a("span.catshow").click(function(){a(".inline-editor ul.cat-checklist").addClass("cat-hover");a(".inline-editor span.cathide").show();a(this).hide()});a("span.cathide").click(function(){a(".inline-editor ul.cat-checklist").removeClass("cat-hover");a(".inline-editor span.catshow").show();a(this).hide()});a('select[name="_status"] option[value="future"]',b).remove();a("#doaction, #doaction2").click(function(f){var g=a(this).attr("id").substr(2);if(a('select[name="'+g+'"]').val()=="edit"){f.preventDefault();c.setBulk()}else{if(a("form#posts-filter tr.inline-editor").length>0){c.revert()}}});a("#post-query-submit").click(function(f){if(a("form#posts-filter tr.inline-editor").length>0){c.revert()}})},toggle:function(c){var b=this;a(b.what+b.getId(c)).css("display")=="none"?b.revert():b.edit(c)},setBulk:function(){var e="",d=this.type,b,f=true;this.revert();a("#bulk-edit td").attr("colspan",a(".widefat:first thead th:visible").length);a("table.widefat tbody").prepend(a("#bulk-edit"));a("#bulk-edit").addClass("inline-editor").show();a('tbody th.check-column input[type="checkbox"]').each(function(g){if(a(this).attr("checked")){f=false;var h=a(this).val(),c;c=a("#inline_"+h+" .post_title").text()||inlineEditL10n.notitle;e+='<div id="ttle'+h+'"><a id="_'+h+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+c+"</div>"}});if(f){return this.revert()}a("#bulk-titles").html(e);a("#bulk-titles a").click(function(){var c=a(this).attr("id").substr(1);a('table.widefat input[value="'+c+'"]').attr("checked","");a("#ttle"+c).remove()});if(d=="post"){b="post_tag";a('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+b,{delay:500,minchars:2,multiple:true,multipleSep:", "})}},edit:function(b){var o=this,j,d,g,n,i,h,k,m,l,c=true,p,e;o.revert();if(typeof(b)=="object"){b=o.getId(b)}j=["post_title","post_name","post_author","_status","jj","mm","aa","hh","mn","ss","post_password"];if(o.type=="page"){j.push("post_parent","menu_order","page_template")}if(o.type=="post"){j.push("tags_input")}d=a("#inline-edit").clone(true);a("td",d).attr("colspan",a(".widefat:first thead th:visible").length);if(a(o.what+b).hasClass("alternate")){a(d).addClass("alternate")}a(o.what+b).hide().after(d);g=a("#inline_"+b);if(!a(':input[name="post_author"] option[value='+a(".post_author",g).text()+"]",d).val()){a(':input[name="post_author"]',d).prepend('<option value="'+a(".post_author",g).text()+'">'+a("#"+o.type+"-"+b+" .author").text()+"</option>")}for(k=0;k<j.length;k++){a(':input[name="'+j[k]+'"]',d).val(a("."+j[k],g).text())}if(a(".comment_status",g).text()=="open"){a('input[name="comment_status"]',d).attr("checked","checked")}if(a(".ping_status",g).text()=="open"){a('input[name="ping_status"]',d).attr("checked","checked")}if(a(".sticky",g).text()=="sticky"){a('input[name="sticky"]',d).attr("checked","checked")}if(n=a(".post_category",g).text()){a("ul.cat-checklist :checkbox",d).val(n.split(","))}i=a("._status",g).text();if(i!="future"){a('select[name="_status"] option[value="future"]',d).remove()}if(i=="private"){a('input[name="keep_private"]',d).attr("checked","checked");a("input.inline-edit-password-input").val("").attr("disabled","disabled")}h=a('select[name="post_parent"] option[value="'+b+'"]',d);if(h.length>0){m=h[0].className.split("-")[1];l=h;while(c){l=l.next("option");if(l.length==0){break}p=l[0].className.split("-")[1];if(p<=m){c=false}else{l.remove();l=h}}h.remove()}a(d).attr("id","edit-"+b).addClass("inline-editor").show();a(".ptitle",d).focus();if(o.type=="post"){e="post_tag";a('tr.inline-editor textarea[name="tags_input"]').suggest("admin-ajax.php?action=ajax-tag-search&tax="+e,{delay:500,minchars:2,multiple:true,multipleSep:", "})}return false},save:function(e){var d,b,c=a(".post_status_page").val()||"";if(typeof(e)=="object"){e=this.getId(e)}a("table.widefat .inline-edit-save .waiting").show();d={action:"inline-save",post_type:this.type,post_ID:e,edit_date:"true",post_status:c};b=a("#edit-"+e+" :input").serialize();d=b+"&"+a.param(d);a.post("admin-ajax.php",d,function(f){a("table.widefat .inline-edit-save .waiting").hide();if(f){if(-1!=f.indexOf("<tr")){a(inlineEditPost.what+e).remove();a("#edit-"+e).before(f).remove();a(inlineEditPost.what+e).hide().fadeIn()}else{f=f.replace(/<.[^<>]*?>/g,"");a("#edit-"+e+" .inline-edit-save").append('<span class="error">'+f+"</span>")}}else{a("#edit-"+e+" .inline-edit-save").append('<span class="error">'+inlineEditL10n.error+"</span>")}},"html");return false},revert:function(){var b;if(b=a("table.widefat tr.inline-editor").attr("id")){a("table.widefat .inline-edit-save .waiting").hide();if("bulk-edit"==b){a("table.widefat #bulk-edit").removeClass("inline-editor").hide();a("#bulk-titles").html("");a("#inlineedit").append(a("#bulk-edit"))}else{a("#"+b).remove();b=b.substr(b.lastIndexOf("-")+1);a(this.what+b).show()}}return false},getId:function(c){var d=c.tagName=="TR"?c.id:a(c).parents("tr").attr("id"),b=d.split("-");return b[b.length-1]}};a(document).ready(function(){inlineEditPost.init()})})(jQuery);

trunk/wp-admin/link-manager.php

@@ -19 +19 @@
 
     if ( 'delete' == $doaction ) {
-        foreach ( (array) $_GET['linkcheck'] as $link_id ) {
+        $bulklinks = (array) $_GET['linkcheck'];
+        foreach ( $bulklinks as $link_id ) {
             $link_id = (int) $link_id;
 
@@ -25 +26 @@
         }
 
-        wp_redirect( wp_get_referer() );
+        wp_safe_redirect( wp_get_referer() );
         exit;
     }

trunk/wp-admin/plugins.php

@@ -65 +65 @@
             check_admin_referer('bulk-manage-plugins');
 
-            $plugins = (array) $_POST['checked'];
+            $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
             $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); //Only activate plugins which are not already active.
             if ( empty($plugins) ) {
@@ -116 +116 @@
             check_admin_referer('bulk-manage-plugins');
 
-            $plugins = (array) $_POST['checked'];
+            $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
             $plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated.
             if ( empty($plugins) ) {
@@ -139 +139 @@
             check_admin_referer('bulk-manage-plugins');
 
-            $plugins = (array) $_REQUEST['checked']; //$_POST = from the plugin form; $_GET = from the FTP details screen.
+            //$_POST = from the plugin form; $_GET = from the FTP details screen.
+            $plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
             $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); //Do not allow to delete Activated plugins.
             if ( empty($plugins) ) {

trunk/wp-includes/script-loader.php

@@ -343 +343 @@
         $scripts->add_data( 'theme-preview', 'group', 1 );
 
-        $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20091016' );
+        $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20091202' );
         $scripts->add_data( 'inline-edit-post', 'group', 1 );
         $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(