X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..refs/tags/wordpress-3.8.2-scripts:/wp-admin/edit-tags.php
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 44b2aa57..56fa11a1 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -7,7 +7,7 @@
*/
/** WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! $taxnow )
wp_die( __( 'Invalid taxonomy' ) );
@@ -26,7 +26,7 @@ $pagenum = $wp_list_table->get_pagenum();
$title = $tax->labels->name;
if ( 'post' != $post_type ) {
- $parent_file = "edit.php?post_type=$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 ) {
$parent_file = 'link-manager.php';
@@ -36,7 +36,7 @@ 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( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
switch ( $wp_list_table->current_action() ) {
@@ -126,8 +126,8 @@ case 'edit':
$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
if ( ! $tag )
wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
- require_once ( 'admin-header.php' );
- include( './edit-tag-form.php' );
+ require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ include( ABSPATH . 'wp-admin/edit-tag-form.php' );
break;
@@ -164,7 +164,7 @@ break;
default:
if ( ! empty($_REQUEST['_wp_http_referer']) ) {
- $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) );
+ $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'] );
@@ -195,7 +195,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
$help = '
' . __( 'You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '
';
if ( 'link_category' == $taxonomy )
- $help .= '' . __( 'You can delete Link Categories in the Bulk Action pulldown, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '
';
+ $help .= '' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '
';
else
$help .='' . __( 'What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '
';
@@ -218,7 +218,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
$help .= '' . __( 'Slug - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '';
if ( 'category' == $taxonomy )
- $help .= '' . __( 'Parent - 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. To create a subcategory, just choose another category from the Parent dropdown.' ) . '';
+ $help .= '' . __( 'Parent - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '';
$help .= '' . __( 'Description - The description is not prominent by default; however, some themes may display it.' ) . '' .
'' .
@@ -247,29 +247,67 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
unset( $help );
}
-require_once ('admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
if ( !current_user_can($tax->cap->edit_terms) )
wp_die( __('You are not allowed to edit this item.') );
-$messages[1] = __('Item added.');
-$messages[2] = __('Item deleted.');
-$messages[3] = __('Item updated.');
-$messages[4] = __('Item not added.');
-$messages[5] = __('Item not updated.');
-$messages[6] = __('Items deleted.');
+$messages = array();
+$messages['_item'] = array(
+ 0 => '', // Unused. Messages start at index 1.
+ 1 => __( 'Item added.' ),
+ 2 => __( 'Item deleted.' ),
+ 3 => __( 'Item updated.' ),
+ 4 => __( 'Item not added.' ),
+ 5 => __( 'Item not updated.' ),
+ 6 => __( 'Items deleted.' )
+);
+$messages['category'] = array(
+ 0 => '', // Unused. Messages start at index 1.
+ 1 => __( 'Category added.' ),
+ 2 => __( 'Category deleted.' ),
+ 3 => __( 'Category updated.' ),
+ 4 => __( 'Category not added.' ),
+ 5 => __( 'Category not updated.' ),
+ 6 => __( 'Categories deleted.' )
+);
+$messages['post_tag'] = array(
+ 0 => '', // Unused. Messages start at index 1.
+ 1 => __( 'Tag added.' ),
+ 2 => __( 'Tag deleted.' ),
+ 3 => __( 'Tag updated.' ),
+ 4 => __( 'Tag not added.' ),
+ 5 => __( 'Tag not updated.' ),
+ 6 => __( 'Tags deleted.' )
+);
+
+/**
+ * Filter the messages displayed when a tag is updated.
+ *
+ * @since 3.7.0
+ *
+ * @param array $messages The messages to be displayed.
+ */
+$messages = apply_filters( 'term_updated_messages', $messages );
+
+$message = false;
+if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
+ if ( isset( $messages[ $taxonomy ][ $msg ] ) )
+ $message = $messages[ $taxonomy ][ $msg ];
+ elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) )
+ $message = $messages['_item'][ $msg ];
+}
?>
-
' . __('Search results for “%s”') . '', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
+ printf( '' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
-
-
+
+
@@ -298,6 +336,7 @@ endif; ?>
@@ -336,20 +385,62 @@ endif;
}
if ( current_user_can($tax->cap->edit_terms) ) {
- // Back compat hooks. Deprecated in preference to {$taxonomy}_pre_add_form
- if ( 'category' == $taxonomy )
- do_action('add_category_form_pre', (object)array('parent' => 0) );
- elseif ( 'link_category' == $taxonomy )
- do_action('add_link_category_form_pre', (object)array('parent' => 0) );
- else
- do_action('add_tag_form_pre', $taxonomy);
+ if ( 'category' == $taxonomy ) {
+ /**
+ * Fires before the Add Category form.
+ *
+ * @since 2.1.0
+ * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead.
+ *
+ * @param object $arg Optional arguments cast to an object.
+ */
+ do_action( 'add_category_form_pre', (object) array( 'parent' => 0 ) );
+ } elseif ( 'link_category' == $taxonomy ) {
+ /**
+ * Fires before the link category form.
+ *
+ * @since 2.3.0
+ * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead.
+ *
+ * @param object $arg Optional arguments cast to an object.
+ */
+ do_action( 'add_link_category_form_pre', (object) array( 'parent' => 0 ) );
+ } else {
+ /**
+ * Fires before the Add Tag form.
+ *
+ * @since 2.5.0
+ * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead.
+ *
+ * @param string $taxonomy The taxonomy slug.
+ */
+ do_action( 'add_tag_form_pre', $taxonomy );
+ }
- do_action($taxonomy . '_pre_add_form', $taxonomy);
+ /**
+ * Fires before the Add Term form for all taxonomies.
+ *
+ * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug.
+ *
+ * @since 3.0.0
+ *
+ * @param string $taxonomy The taxonomy slug.
+ */
+ do_action( "{$taxonomy}_pre_add_form", $taxonomy );
?>
@@ -408,11 +582,13 @@ do_action($taxonomy . '_add_form', $taxonomy);
-
+
inline_edit(); ?>