X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..46588ee871246a923d972538dbc93b26f4fda932:/wp-admin/edit-tags.php diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 56fa11a1..7afbec8b 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -18,7 +18,10 @@ if ( ! $tax ) wp_die( __( 'Invalid taxonomy' ) ); if ( ! current_user_can( $tax->cap->manage_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); + +// $post_type is set when the WP_Terms_List_Table instance is created +global $post_type; $wp_list_table = _get_list_table('WP_Terms_List_Table'); $pagenum = $wp_list_table->get_pagenum(); @@ -28,7 +31,7 @@ $title = $tax->labels->name; if ( 'post' != $post_type ) { $parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type"; $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type"; -} else if ( 'link_category' == $tax->name ) { +} elseif ( 'link_category' == $tax->name ) { $parent_file = 'link-manager.php'; $submenu_file = 'edit-tags.php?taxonomy=link_category'; } else { @@ -36,7 +39,9 @@ if ( 'post' != $post_type ) { $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; } -add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); +add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) ); + +$location = false; switch ( $wp_list_table->current_action() ) { @@ -45,7 +50,7 @@ case 'add-tag': check_admin_referer( 'add-tag', '_wpnonce_add-tag' ); if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST ); $location = 'edit-tags.php?taxonomy=' . $taxonomy; @@ -60,10 +65,9 @@ case 'add-tag': if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 1, $location ); else - $location = add_query_arg( 'message', 4, $location ); - wp_redirect( $location ); - exit; -break; + $location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location ); + + break; case 'delete': $location = 'edit-tags.php?taxonomy=' . $taxonomy; @@ -74,30 +78,27 @@ case 'delete': $location = $referer; } - if ( !isset( $_REQUEST['tag_ID'] ) ) { - wp_redirect( $location ); - exit; + if ( ! isset( $_REQUEST['tag_ID'] ) ) { + break; } $tag_ID = (int) $_REQUEST['tag_ID']; check_admin_referer( 'delete-tag_' . $tag_ID ); if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); wp_delete_term( $tag_ID, $taxonomy ); $location = add_query_arg( 'message', 2, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'bulk-delete': check_admin_referer( 'bulk-tags' ); if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $tags = (array) $_REQUEST['delete_tags']; foreach ( $tags as $tag_ID ) { @@ -113,10 +114,8 @@ case 'bulk-delete': } $location = add_query_arg( 'message', 6, $location ); - wp_redirect( $location ); - exit; -break; + break; case 'edit': $title = $tax->labels->edit_item; @@ -128,15 +127,16 @@ case 'edit': wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); include( ABSPATH . 'wp-admin/edit-tag-form.php' ); + include( ABSPATH . 'wp-admin/admin-footer.php' ); -break; + exit; case 'editedtag': $tag_ID = (int) $_POST['tag_ID']; check_admin_referer( 'update-tag_' . $tag_ID ); if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $tag = get_term( $tag_ID, $taxonomy ); if ( ! $tag ) @@ -156,19 +156,18 @@ case 'editedtag': if ( $ret && !is_wp_error( $ret ) ) $location = add_query_arg( 'message', 3, $location ); else - $location = add_query_arg( 'message', 5, $location ); - - wp_redirect( $location ); - exit; -break; + $location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location ); + break; +} -default: -if ( ! empty($_REQUEST['_wp_http_referer']) ) { +if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) { $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ); +} - if ( ! empty( $_REQUEST['paged'] ) ) - $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); - +if ( $location ) { + if ( ! empty( $_REQUEST['paged'] ) ) { + $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location ); + } wp_redirect( $location ); exit; } @@ -234,13 +233,13 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help = '
' . __( 'For more information:' ) . '
'; if ( 'category' == $taxonomy ) - $help .= '' . __( 'Documentation on Categories' ) . '
'; + $help .= '' . __( 'Documentation on Categories' ) . '
'; elseif ( 'link_category' == $taxonomy ) - $help .= '' . __( 'Documentation on Link Categories' ) . '
'; + $help .= '' . __( 'Documentation on Link Categories' ) . '
'; else - $help .= '' . __( 'Documentation on Tags' ) . '
'; + $help .= '' . __( 'Documentation on Tags' ) . '
'; - $help .= '' . __('Support Forums') . '
'; + $help .= '' . __('Support Forums') . '
'; get_current_screen()->set_help_sidebar( $help ); @@ -298,6 +297,7 @@ if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) { $message = $messages['_item'][ $msg ]; } +$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated'; ?>