From 95fcd6b7ee1bc85843446888cb5bcb4c1d36657c Mon Sep 17 00:00:00 2001 From: dd32 Date: Thu, 4 Feb 2010 11:01:07 +0000 Subject: [PATCH] Remove redundant Category forms/code/ajax. See #11838 git-svn-id: http://svn.automattic.com/wordpress/trunk@12942 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-ajax.php | 67 ------- wp-admin/categories.php | 339 -------------------------------- wp-admin/edit-category-form.php | 85 -------- 3 files changed, 491 deletions(-) delete mode 100644 wp-admin/categories.php delete mode 100644 wp-admin/edit-category-form.php diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 7976c69253..e2afc9da0b 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -312,20 +312,6 @@ case 'delete-comment' : // On success, die with time() instead of 1 _wp_ajax_delete_comment_response( $comment->comment_ID ); die( '0' ); break; -case 'delete-cat' : - check_ajax_referer( "delete-category_$id" ); - if ( !current_user_can( 'manage_categories' ) ) - die('-1'); - - $cat = get_category( $id ); - if ( !$cat || is_wp_error( $cat ) ) - die('1'); - - if ( wp_delete_category( $id ) ) - die('1'); - else - die('0'); - break; case 'delete-tag' : $tag_id = (int) $_POST['tag_ID']; check_ajax_referer( "delete-tag_$tag_id" ); @@ -511,59 +497,6 @@ case 'add-link-category' : // On the Fly } $x->send(); break; -case 'add-cat' : // From Manage->Categories - check_ajax_referer( 'add-category' ); - if ( !current_user_can( 'manage_categories' ) ) - die('-1'); - - if ( '' === trim($_POST['cat_name']) ) { - $x = new WP_Ajax_Response( array( - 'what' => 'cat', - 'id' => new WP_Error( 'cat_name', __('You did not enter a category name.') ) - ) ); - $x->send(); - } - - if ( is_term( trim( $_POST['cat_name'] ), $_POST['taxonomy'], $_POST['category_parent'] ) ) { - $x = new WP_Ajax_Response( array( - 'what' => 'cat', - 'id' => new WP_Error( 'cat_exists', __('The category you are trying to create already exists.'), array( 'form-field' => 'cat_name' ) ), - ) ); - $x->send(); - } - - $cat = wp_insert_category( $_POST, true ); - - if ( is_wp_error($cat) ) { - $x = new WP_Ajax_Response( array( - 'what' => 'cat', - 'id' => $cat - ) ); - $x->send(); - } - - if ( !$cat || (!$cat = get_term( $cat, $_POST['taxonomy'] ) ) ) - die('0'); - - $level = 0; - $cat_full_name = $cat->name; - $_cat = $cat; - while ( $_cat->parent ) { - $_cat = get_category( $_cat->parent ); - $cat_full_name = $_cat->name . ' — ' . $cat_full_name; - $level++; - } - $cat_full_name = esc_attr($cat_full_name); - - $x = new WP_Ajax_Response( array( - 'what' => 'cat', - 'id' => $cat->term_id, - 'position' => -1, - 'data' => _cat_row( $cat, $level, $cat_full_name ), - 'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category %s added' ), "cat-$cat->term_id", $cat_full_name)) - ) ); - $x->send(); - break; case 'add-link-cat' : // From Blogroll -> Categories check_ajax_referer( 'add-link-category' ); if ( !current_user_can( 'manage_categories' ) ) diff --git a/wp-admin/categories.php b/wp-admin/categories.php deleted file mode 100644 index 5e8e36e320..0000000000 --- a/wp-admin/categories.php +++ /dev/null @@ -1,339 +0,0 @@ - true) ) ) ) - $post_type = 'post'; - -if ( 'post' != $post_type ) { - $parent_file = "edit.php?post_type=$post_type"; - $submenu_file = "categories.php?taxonomy=$taxonomy&post_type=$post_type"; -} else { - $parent_file = 'edit.php'; - $submenu_file = "categories.php?taxonomy=$taxonomy"; -} - - -if ( isset( $_GET['action'] ) && isset($_GET['delete']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) - $action = 'bulk-delete'; - -switch($action) { - -case 'addcat': - - check_admin_referer('add-category'); - - if ( !current_user_can('manage_categories') ) - wp_die(__('Cheatin’ uh?')); - - if ( wp_insert_category($_POST ) ) - wp_safe_redirect( add_query_arg( 'message', 1, wp_get_referer() ) . '#addcat' ); - else - wp_safe_redirect( add_query_arg( 'message', 4, wp_get_referer() ) . '#addcat' ); - - exit; -break; - -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); - - if ( !current_user_can('manage_categories') ) - wp_die(__('Cheatin’ uh?')); - - // Don't delete the default cats. - if ( $cat_ID == get_option('default_category') ) - wp_die( sprintf( __("Can’t delete the %s category: this is the default one"), get_cat_name($cat_ID) ) ); - - wp_delete_category($cat_ID); - - wp_safe_redirect( add_query_arg( 'message', 2, wp_get_referer() ) ); - exit; - -break; - -case 'bulk-delete': - check_admin_referer('bulk-categories'); - - if ( !current_user_can('manage_categories') ) - wp_die( __('You are not allowed to delete categories.') ); - - $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’t delete the %s category: this is the default one"), get_cat_name($cat_ID) ) ); - - wp_delete_category($cat_ID); - } - - wp_safe_redirect( wp_get_referer() ); - exit; - -break; -case 'edit': - - $title = __('Edit Category'); - - require_once ('admin-header.php'); - $cat_ID = (int) $_GET['cat_ID']; - $category = get_category_to_edit($cat_ID); - include('edit-category-form.php'); - -break; - -case 'editedcat': - $cat_ID = (int) $_POST['cat_ID']; - check_admin_referer('update-category_' . $cat_ID); - - if ( !current_user_can('manage_categories') ) - wp_die(__('Cheatin’ uh?')); - - $location = 'categories.php'; - if ( $referer = wp_get_original_referer() ) { - if ( false !== strpos($referer, 'categories.php') ) - $location = $referer; - } - - if ( wp_update_category($_POST) ) - $location = add_query_arg('message', 3, $location); - else - $location = add_query_arg('message', 5, $location); - - wp_redirect($location); - - exit; -break; - -default: - -if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { - wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); - exit; -} - -wp_enqueue_script('admin-categories'); -if ( current_user_can('manage_categories') ) - wp_enqueue_script('inline-edit-tax'); - -require_once ('admin-header.php'); - -$messages[1] = __('Category added.'); -$messages[2] = __('Category deleted.'); -$messages[3] = __('Category updated.'); -$messages[4] = __('Category not added.'); -$messages[5] = __('Category not updated.'); -?> - -
- -

' . __('Search results for “%s”') . '', esc_html( stripslashes($_GET['s']) ) ); ?> -

- - -

- - -
- - -

- - - -

-
-
- -
- -
-
-
- - -
- - $taxonomy, 'hide_empty' => 0, 'search' => $_GET['s']))); -else - $num_cats = wp_count_terms($taxonomy); - -$page_links = paginate_links( array( - 'base' => add_query_arg( 'pagenum', '%#%' ), - 'format' => '', - 'prev_text' => __('«'), - 'next_text' => __('»'), - 'total' => ceil($num_cats / $cats_per_page), - 'current' => $pagenum -)); - -if ( $page_links ) - echo "
$page_links
"; -?> - -
- - - -
- -
-
- -
- - - - - - - - - - - - - - - - - -
- -
-$page_links
"; -?> - -
- - - -
- -
-
- - - -
- -

Note:
Deleting a %1$s does not delete the objects in that %1$s. Instead, objects that were only assigned to the deleted %1$s are set to the %1$s %2$s.'), $tax->label, apply_filters('the_category', get_cat_name(get_option('default_' . $taxonomy)))) ?>

- - -

category to tag converter.'), 'admin.php?import=wp-cat2tag') ?>

- -
- -
-
- -
-
- - -parent = 0; do_action('add_category_form_pre', $category); ?> - -
-

-
-
- - - - - -
- - -

-
- -
- - -

-
- -
- - 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?> -

-
- -
- - -

-
- -

- -
- - - -
-
- -
- - - diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php deleted file mode 100644 index 354f4bf838..0000000000 --- a/wp-admin/edit-category-form.php +++ /dev/null @@ -1,85 +0,0 @@ -name ) ) - $category->name = ''; - - if ( ! isset( $category->slug ) ) - $category->slug = ''; - - if ( ! isset( $category->parent ) ) - $category->parent = ''; - - if ( ! isset( $category->description ) ) - $category->description = ''; -} - -do_action('edit_category_form_pre', $category); - -_fill_empty_category($category); -?> - -
- -

-
-
- - - - - - - - - - - - - - - - - - - - - - - -

-
- 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'exclude' => $category->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
- -

-
-

- -
-