<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12942] trunk/wp-admin: Remove redundant Category forms/code/ajax.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12942">12942</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-04 11:01:07 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove redundant Category forms/code/ajax. See <a href="http://trac.wordpress.org/ticket/11838">#11838</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadmincategoriesphp">trunk/wp-admin/categories.php</a></li>
<li><a href="#trunkwpadmineditcategoryformphp">trunk/wp-admin/edit-category-form.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12941 => 12942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-02-04 10:51:58 UTC (rev 12941)
+++ trunk/wp-admin/admin-ajax.php 2010-02-04 11:01:07 UTC (rev 12942)
</span><span class="lines">@@ -312,20 +312,6 @@
</span><span class="cx"> _wp_ajax_delete_comment_response( $comment->comment_ID );
</span><span class="cx"> die( '0' );
</span><span class="cx"> break;
</span><del>-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;
</del><span class="cx"> case 'delete-tag' :
</span><span class="cx"> $tag_id = (int) $_POST['tag_ID'];
</span><span class="cx"> check_ajax_referer( "delete-tag_$tag_id" );
</span><span class="lines">@@ -511,59 +497,6 @@
</span><span class="cx"> }
</span><span class="cx"> $x->send();
</span><span class="cx"> break;
</span><del>-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 . ' &#8212; ' . $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 <a href="#%s">%s</a> added' ), "cat-$cat->term_id", $cat_full_name))
- ) );
- $x->send();
- break;
</del><span class="cx"> case 'add-link-cat' : // From Blogroll -> Categories
</span><span class="cx"> check_ajax_referer( 'add-link-category' );
</span><span class="cx"> if ( !current_user_can( 'manage_categories' ) )
</span></span></pre></div>
<a id="trunkwpadmincategoriesphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/categories.php (12941 => 12942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/categories.php 2010-02-04 10:51:58 UTC (rev 12941)
+++ trunk/wp-admin/categories.php 2010-02-04 11:01:07 UTC (rev 12942)
</span><span class="lines">@@ -1,339 +0,0 @@
</span><del>-<?php
-/**
- * Categories Management Panel
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Bootstrap */
-require_once('admin.php');
-
-$title = __('Categories');
-
-wp_reset_vars( array('action', 'taxonomy', 'post_type') );
-
-if ( empty($taxonomy) )
- $taxonomy = 'category';
-
-if ( !is_taxonomy($taxonomy) )
- wp_die(__('Invalid taxonomy'));
-
-if ( empty($post_type) || !in_array( $post_type, get_post_types( array('_show' => true) ) ) )
- $post_type = 'post';
-
-if ( 'post' != $post_type ) {
- $parent_file = "edit.php?post_type=$post_type";
- $submenu_file = "categories.php?taxonomy=$taxonomy&amp;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&#8217; 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&#8217; uh?'));
-
- // 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"), 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&#8217;t delete the <strong>%s</strong> 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&#8217; 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.');
-?>
-
-<div class="wrap nosubsub">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title );
-if ( !empty($_GET['s']) )
- printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
-</h2>
-
-<?php
-if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
-<div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
-endif; ?>
-
-<form class="search-form topmargin" action="" method="get">
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
-<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
-<p class="search-box">
- <label class="screen-reader-text" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
- <input type="text" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
- <input type="submit" value="<?php esc_attr_e( 'Search Categories' ); ?>" class="button" />
-</p>
-</form>
-<br class="clear" />
-
-<div id="col-container">
-
-<div id="col-right">
-<div class="col-wrap">
-<form id="posts-filter" action="" method="get">
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
-<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
-<div class="tablenav">
-
-<?php
-$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
-if ( empty($pagenum) )
- $pagenum = 1;
-
-$cats_per_page = (int) get_user_option( 'categories_per_page' );
-if ( empty( $cats_per_page ) || $cats_per_page < 1 )
- $cats_per_page = 20;
-$cats_per_page = apply_filters( 'edit_categories_per_page', $cats_per_page );
-
-if ( !empty($_GET['s']) )
- $num_cats = count(get_categories(array('taxonomy' => $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' => __('&laquo;'),
- 'next_text' => __('&raquo;'),
- 'total' => ceil($num_cats / $cats_per_page),
- 'current' => $pagenum
-));
-
-if ( $page_links )
- echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<?php wp_nonce_field('bulk-categories'); ?>
-</div>
-
-<br class="clear" />
-</div>
-
-<div class="clear"></div>
-
-<table class="widefat fixed" cellspacing="0">
- <thead>
- <tr>
-<?php print_column_headers('categories'); ?>
- </tr>
- </thead>
-
- <tfoot>
- <tr>
-<?php print_column_headers('categories', false); ?>
- </tr>
- </tfoot>
-
- <tbody id="the-list" class="list:cat">
-<?php
-cat_rows(0, 0, 0, $pagenum, $cats_per_page, $taxonomy);
-?>
- </tbody>
-</table>
-
-<div class="tablenav">
-<?php
-if ( $page_links )
- echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php wp_nonce_field('bulk-categories'); ?>
-</div>
-
-<br class="clear" />
-</div>
-
-</form>
-
-<div class="form-wrap">
-<?php if ( get_option('default_' . $taxonomy) ) : ?>
-<p><?php printf(__('<strong>Note:</strong><br />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 <strong>%2$s</strong>.'), $tax->label, apply_filters('the_category', get_cat_name(get_option('default_' . $taxonomy)))) ?></p>
-<?php endif; ?>
-<?php if ( 'category' == $taxonomy ) : ?>
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
-<?php endif; ?>
-</div>
-
-</div>
-</div><!-- /col-right -->
-
-<div id="col-left">
-<div class="col-wrap">
-
-<?php if ( current_user_can('manage_categories') ) { ?>
-<?php $category = (object) array(); $category->parent = 0; do_action('add_category_form_pre', $category); ?>
-
-<div class="form-wrap">
-<h3><?php _e('Add Category'); ?></h3>
-<div id="ajax-response"></div>
-<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
-<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
-<input type="hidden" name="action" value="addcat" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-category'); ?>
-
-<div class="form-field form-required">
- <label for="cat_name"><?php _e('Category Name') ?></label>
- <input name="cat_name" id="cat_name" type="text" value="" size="40" aria-required="true" />
- <p><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></p>
-</div>
-<?php if ( !is_multisite() ) { ?>
-<div class="form-field">
- <label for="category_nicename"><?php _e('Category Slug') ?></label>
- <input name="category_nicename" id="category_nicename" type="text" value="" size="40" />
- <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
-</div>
-<?php } ?>
-<div class="form-field">
- <label for="category_parent"><?php _e('Category Parent') ?></label>
- <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
- <p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
-</div>
-
-<div class="form-field">
- <label for="category_description"><?php _e('Description') ?></label>
- <textarea name="category_description" id="category_description" rows="5" cols="40"></textarea>
- <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
-</div>
-
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Category'); ?>" /></p>
-<?php do_action('edit_category_form', $category); ?>
-</form></div>
-
-<?php } ?>
-
-</div>
-</div><!-- /col-left -->
-
-</div><!-- /col-container -->
-</div><!-- /wrap -->
-
-<?php
-inline_edit_term_row('categories');
-
-break;
-}
-
-include('admin-footer.php');
-
-?>
</del></span></pre></div>
<a id="trunkwpadmineditcategoryformphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/edit-category-form.php (12941 => 12942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-category-form.php 2010-02-04 10:51:58 UTC (rev 12941)
+++ trunk/wp-admin/edit-category-form.php 2010-02-04 11:01:07 UTC (rev 12942)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-<?php
-/**
- * Edit category form for inclusion in administration panels.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-// don't load directly
-if ( !defined('ABSPATH') )
- die('-1');
-
-if ( !current_user_can('manage_categories') )
- wp_die(__('You do not have sufficient permissions to edit categories for this blog.'));
-
-/**
- * @var object
- */
-if ( ! isset( $category ) )
- $category = (object) array();
-
-/**
- * @ignore
- * @since 2.7
- * @internal Used to prevent errors in page when no category is being edited.
- *
- * @param object $category
- */
-function _fill_empty_category(&$category) {
- if ( ! isset( $category->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);
-?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e('Edit Category'); ?></h2>
-<div id="ajax-response"></div>
-<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">
-<input type="hidden" name="action" value="editedcat" />
-<input type="hidden" name="cat_ID" value="<?php echo esc_attr($category->term_id) ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-category_' . $cat_ID); ?>
- <table class="form-table">
- <tr class="form-field form-required">
- <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
- <td><input name="cat_name" id="cat_name" type="text" value="<?php echo esc_attr($category->name); ?>" size="40" aria-required="true" /></td>
- </tr>
-<?php if ( !is_multisite() ) { ?>
- <tr class="form-field">
- <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
- <td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo esc_attr(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
- <span class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></span></td>
- </tr>
-<?php } ?>
- <tr class="form-field">
- <th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
- <td>
- <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'exclude' => $category->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
- <span class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></span>
- </td>
- </tr>
- <tr class="form-field">
- <th scope="row" valign="top"><label for="category_description"><?php _e('Description') ?></label></th>
- <td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($category->description); ?></textarea><br />
- <span class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></span></td>
- </tr>
- <?php do_action('edit_category_form_fields', $category); ?>
- </table>
-<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Category'); ?>" /></p>
-<?php do_action('edit_category_form', $category); ?>
-</form>
-</div>
</del></span></pre>
</div>
</div>
</body>
</html>