diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 951b8e88c..830d114d7 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -442,12 +442,12 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) { $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID"); $pad = str_repeat('— ', $level); if ( current_user_can('manage_categories') ) - $edit = "" . __('Edit') . "escape($category->cat_name)) . "')\" class='delete'>" . __('Delete') . ""; + $edit = "" . __('Edit') . "cat_ID, '" . sprintf(__("You are about to delete the category "%s". All of its posts will go to the default category.\\n"OK" to delete, "Cancel" to stop."), wp_specialchars($category->cat_name, 1)) . "' );\" class='delete'>" . __('Delete') . ""; else $edit = ''; $class = ('alternate' == $class) ? '' : 'alternate'; - echo "$category->cat_ID$pad $category->cat_name + echo "$category->cat_ID$pad $category->cat_name $category->category_description $count $edit @@ -473,7 +473,7 @@ function page_rows( $parent = 0, $level = 0, $pages = 0 ) { $id = $post->ID; $class = ('alternate' == $class) ? '' : 'alternate'; ?> - + ID; ?> @@ -482,7 +482,7 @@ function page_rows( $parent = 0, $level = 0, $pages = 0 ) { post_modified); ?> " . __('Edit') . ""; } ?> - " . __('Delete') . ""; } ?> + " . __('Delete') . ""; } ?> + + @@ -104,7 +106,6 @@ tinyMCE.init({ -