Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 4040) +++ wp-admin/admin-ajax.php (working copy) @@ -144,26 +144,22 @@ die('0'); if ( !$cat = get_category( $cat ) ) die('0'); - $pad = 0; + $level = 0; + $cat_full_name = $cat->cat_name; $_cat = $cat; while ( $_cat->category_parent ) { $_cat = get_category( $_cat->category_parent ); - $pad++; + $cat_full_name = $_cat->cat_name . ' — ' . $cat_full_name; + $level++; } - $pad = str_repeat('— ', $pad); + $cat_full_name = wp_specialchars( $cat_full_name, 1 ); $r = ""; - $r .= "$cat->cat_ID"; - $r .= "$cat->cat_ID$pad $cat->cat_name"; - $r .= "$cat->category_description$cat->category_count$cat->link_count"; - $r .= "" . __('Edit') . ""; - $r .= "cat_name)); - $r .= "\" );' class='delete'>".__('Delete').""; + $r .= "$cat->cat_ID$cat_full_name"; + $r .= _cat_row( $cat, $level, $cat_full_name ); $r .= "]]>"; header('Content-type: text/xml'); die($r); - break; case 'add-meta' : if ( !current_user_can( 'edit_post', $id ) ) Index: wp-admin/admin-functions.php =================================================================== --- wp-admin/admin-functions.php (revision 4040) +++ wp-admin/admin-functions.php (working copy) @@ -684,39 +684,13 @@ // Dandy new recursive multiple category stuff. function cat_rows($parent = 0, $level = 0, $categories = 0) { - global $wpdb, $class; - if (!$categories) $categories = get_categories('hide_empty=0'); if ($categories) { foreach ($categories as $category) { if ($category->category_parent == $parent) { - $category->cat_name = wp_specialchars($category->cat_name,'double'); - $pad = str_repeat('— ', $level); - if ( current_user_can('manage_categories') ) { - $edit = "".__('Edit').""; - $default_cat_id = get_option('default_category'); - $default_link_cat_id = get_option('default_link_category'); - - if ( ($category->cat_ID != $default_cat_id) && ($category->cat_ID != $default_link_cat_id) ) - $edit .= "cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category "%s".\\nAll of its posts will go into the default category of "%s"\\nAll of its bookmarks will go into the default category of "%s".\\n"OK" to delete, "Cancel" to stop."), js_escape($category->cat_name), js_escape(get_catname($default_cat_id)), js_escape(get_catname($default_link_cat_id))) . "' );\" class='delete'>".__('Delete').""; - else - $edit .= "".__("Default"); - } - else - $edit = ''; - - $class = ('alternate' == $class) ? '' : 'alternate'; - - $category->category_count = number_format( $category->category_count ); - $category->link_count = number_format( $category->link_count ); - echo "$category->cat_ID$pad $category->cat_name - $category->category_description - $category->category_count - $category->link_count - $edit - "; + echo "\t" . _cat_row( $category, $level ); cat_rows($category->cat_ID, $level +1, $categories); } } @@ -725,6 +699,35 @@ } } +function _cat_row( $category, $level, $name_override = false ) { + global $class; + + $pad = str_repeat('— ', $level); + if ( current_user_can('manage_categories') ) { + $edit = "".__('Edit').""; + $default_cat_id = get_option('default_category'); + $default_link_cat_id = get_option('default_link_category'); + + if ( ($category->cat_ID != $default_cat_id) && ($category->cat_ID != $default_link_cat_id) ) + $edit .= "cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category "%s".\\nAll of its posts will go into the default category of "%s"\\nAll of its bookmarks will go into the default category of "%s".\\n"OK" to delete, "Cancel" to stop."), js_escape($category->cat_name), js_escape(get_catname($default_cat_id)), js_escape(get_catname($default_link_cat_id))) . "' );\" class='delete'>".__('Delete').""; + else + $edit .= "".__("Default"); + } else + $edit = ''; + + $class = ( ( defined('DOING_AJAX') && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'"; + + $category->category_count = number_format( $category->category_count ); + $category->link_count = number_format( $category->link_count ); + return " + $category->cat_ID + " . ( $name_override ? $name_override : $pad . ' ' . $category->cat_name ) . " + $category->category_description + $category->category_count + $category->link_count + $edit\n\t\n"; +} + function page_rows($parent = 0, $level = 0, $pages = 0, $hierarchy = true) { global $wpdb, $class, $post; Index: wp-admin/admin-db.php =================================================================== --- wp-admin/admin-db.php (revision 4040) +++ wp-admin/admin-db.php (working copy) @@ -108,7 +108,7 @@ $category_description = apply_filters('pre_category_description', $category_description); $category_parent = (int) $category_parent; - if (empty ($category_parent)) + if ( empty($category_parent) || !get_category( $category_parent ) ) $category_parent = 0; if ( isset($posts_private) ) Index: wp-admin/categories.js =================================================================== --- wp-admin/categories.js (revision 4040) +++ wp-admin/categories.js (working copy) @@ -1,5 +1,16 @@ -addLoadEvent(newCategoryAddIn); -function newCategoryAddIn() { +addLoadEvent(function() { if (!theList.theList) return false; document.forms.addcat.submit.onclick = function(e) {return killSubmit('theList.ajaxAdder("cat", "addcat");', e); }; -} + theList.addComplete = function(what, where, update) { + var name = getNodeValue(theList.ajaxAdd.responseXML, 'name'); + var id = getNodeValue(theList.ajaxAdd.responseXML, 'id'); + var options = document.forms['addcat'].category_parent.options; + options[options.length] = new Option(name, id); + }; + theList.delComplete = function(what, id) { + var options = document.forms['addcat'].category_parent.options; + for ( var o = 0; o < options.length; o++ ) + if ( id == options[o].value ) + options[o] = null; + }; +});