WordPress 3.7.2-scripts

[autoinstalls/wordpress.git] / wp-admin / edit-tags.php

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 0a82e29f3c292b39bfdd03bebe993ea8be082b8a..0a046370b3587696c818403415c125d4aafdaf9d 100644 (file)
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -1,15 +1,23 @@
 <?php
 /**
 <?php
 /**

- * Edit Tags Administration Panel.
+ * Edit Tags Administration Screen.

  *
  * @package WordPress
  * @subpackage Administration
  */
 
 /** WordPress Administration Bootstrap */
  *
  * @package WordPress
  * @subpackage Administration
  */
 
 /** WordPress Administration Bootstrap */

-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
+
+if ( ! $taxnow )
+       wp_die( __( 'Invalid taxonomy' ) );
+

 $tax = get_taxonomy( $taxnow );
 $tax = get_taxonomy( $taxnow );

-if ( !current_user_can( $tax->cap->manage_terms ) )
+
+if ( ! $tax )
+       wp_die( __( 'Invalid taxonomy' ) );
+
+if ( ! current_user_can( $tax->cap->manage_terms ) )

        wp_die( __( 'Cheatin&#8217; uh?' ) );
 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');
        wp_die( __( 'Cheatin&#8217; uh?' ) );
 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');


@@ -18,7 +26,7 @@ $pagenum = $wp_list_table->get_pagenum();
 $title = $tax->labels->name;
 
 if ( 'post' != $post_type ) {
 $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&amp;post_type=$post_type";
 } else if ( 'link_category' == $tax->name ) {
        $parent_file = 'link-manager.php';
        $submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
 } else if ( 'link_category' == $tax->name ) {
        $parent_file = 'link-manager.php';


@@ -28,13 +36,13 @@ if ( 'post' != $post_type ) {
        $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
        $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() ) {
 
 case 'add-tag':
 
 
 switch ( $wp_list_table->current_action() ) {
 
 case 'add-tag':
 

-       check_admin_referer( 'add-tag' );
+       check_admin_referer( 'add-tag', '_wpnonce_add-tag' );

 
        if ( !current_user_can( $tax->cap->edit_terms ) )
                wp_die( __( 'Cheatin&#8217; uh?' ) );
 
        if ( !current_user_can( $tax->cap->edit_terms ) )
                wp_die( __( 'Cheatin&#8217; uh?' ) );


@@ -72,7 +80,7 @@ case 'delete':
        }
 
        $tag_ID = (int) $_REQUEST['tag_ID'];
        }
 
        $tag_ID = (int) $_REQUEST['tag_ID'];

-       check_admin_referer( 'delete-tag_' .  $tag_ID );
+       check_admin_referer( 'delete-tag_' . $tag_ID );

 
        if ( !current_user_can( $tax->cap->delete_terms ) )
                wp_die( __( 'Cheatin&#8217; uh?' ) );
 
        if ( !current_user_can( $tax->cap->delete_terms ) )
                wp_die( __( 'Cheatin&#8217; uh?' ) );


@@ -113,11 +121,13 @@ break;
 case 'edit':
        $title = $tax->labels->edit_item;
 
 case 'edit':
        $title = $tax->labels->edit_item;
 

-       require_once ( 'admin-header.php' );

        $tag_ID = (int) $_REQUEST['tag_ID'];
 
        $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
        $tag_ID = (int) $_REQUEST['tag_ID'];
 
        $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );

-       include( './edit-tag-form.php' );
+       if ( ! $tag )
+               wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+       require_once( ABSPATH . 'wp-admin/admin-header.php' );
+       include( ABSPATH . 'wp-admin/edit-tag-form.php' );

 
 break;
 
 
 break;
 


@@ -128,6 +138,10 @@ case 'editedtag':
        if ( !current_user_can( $tax->cap->edit_terms ) )
                wp_die( __( 'Cheatin&#8217; uh?' ) );
 
        if ( !current_user_can( $tax->cap->edit_terms ) )
                wp_die( __( 'Cheatin&#8217; uh?' ) );
 

+       $tag = get_term( $tag_ID, $taxonomy );
+       if ( ! $tag )
+               wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+

        $ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
        $location = 'edit-tags.php?taxonomy=' . $taxonomy;
        $ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
        $location = 'edit-tags.php?taxonomy=' . $taxonomy;


@@ -150,7 +164,7 @@ break;
 
 default:
 if ( ! empty($_REQUEST['_wp_http_referer']) ) {
 
 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'] );
 
        if ( ! empty( $_REQUEST['paged'] ) )
                $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] );


@@ -176,62 +190,106 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
        if ( 'category' == $taxonomy )
                $help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
        elseif ( 'link_category' == $taxonomy )
        if ( 'category' == $taxonomy )
                $help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
        elseif ( 'link_category' == $taxonomy )

-               $help = '<p>' . __( 'You can create groups of links by using link categories. Link category names must be unique and link categories are separate from the categories you use for posts.' ) . '</p>';
+               $help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';

        else
        else

-               $help = '<p>' . __( 'You can assign keywords to your posts using Post Tags. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+               $help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';

 
        if ( 'link_category' == $taxonomy )
 
        if ( 'link_category' == $taxonomy )

-               $help .= '<p>' . __( '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.' ) . '</p>';
+               $help .= '<p>' . __( '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.' ) . '</p>';

        else
                $help .='<p>' . __( 'What&#8217;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.' ) . '</p>';
 
        else
                $help .='<p>' . __( 'What&#8217;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.' ) . '</p>';
 

-       if ( 'category' == $taxonomy )
-               $help .= '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
-       elseif ( 'post_tag' == $taxonomy )
-               $help .= '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+       get_current_screen()->add_help_tab( array(
+               'id'      => 'overview',
+               'title'   => __('Overview'),
+               'content' => $help,
+       ) );

 
 

-       if ( 'category' == $taxonomy || 'post_tag' == $taxonomy  )
+       if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
+               if ( 'category' == $taxonomy )
+                       $help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+               else
+                       $help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';

 
                $help .= '<ul>' .
                '<li>' . __( '<strong>Name</strong> - The name is how it appears on your site.' ) . '</li>';
 
 
                $help .= '<ul>' .
                '<li>' . __( '<strong>Name</strong> - The name is how it appears on your site.' ) . '</li>';
 

-       if ( ! global_terms_enabled()  )
-       if ( 'category' == $taxonomy || 'post_tag' == $taxonomy  )
-               $help .= '<li>' . __( '<strong>Slug</strong> - The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+               if ( ! global_terms_enabled() )
+                       $help .= '<li>' . __( '<strong>Slug</strong> - The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';

 
 

-       if ( 'category' == $taxonomy )
-               $help .= '<li>' . __( '<strong>Parent</strong> - 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.' ) . '</li>';
+               if ( 'category' == $taxonomy )
+                       $help .= '<li>' . __( '<strong>Parent</strong> - 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.' ) . '</li>';

 
 

-       if ( 'category' == $taxonomy || 'post_tag' == $taxonomy  )

                $help .= '<li>' . __( '<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
                '</ul>' .
                $help .= '<li>' . __( '<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
                '</ul>' .

-               '<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>' .
-               '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
+               '<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
+
+               get_current_screen()->add_help_tab( array(
+                       'id'      => 'adding-terms',
+                       'title'   => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ),
+                       'content' => $help,
+               ) );
+       }
+
+       $help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';

 
        if ( 'category' == $taxonomy )
 
        if ( 'category' == $taxonomy )

-               $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Categories_SubPanel" target="_blank">Documentation on Categories</a>' ) . '</p>';
+               $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>' ) . '</p>';

        elseif ( 'link_category' == $taxonomy )
        elseif ( 'link_category' == $taxonomy )

-               $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Links_Link_Categories_SubPanel" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
+               $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';

        else
        else

-               $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Post_Tags_SubPanel" target="_blank">Documentation on Post Tags</a>' ) . '</p>';
+               $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Tags_Screen" target="_blank">Documentation on Tags</a>' ) . '</p>';

 
        $help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
 
 
        $help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
 

-       add_contextual_help($current_screen, $help);
-       unset($help);
+       get_current_screen()->set_help_sidebar( $help );
+
+       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.') );
 
 
 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.' )
+);
+
+$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 ];
+}

 
 ?>
 
 
 ?>
 


@@ -239,11 +297,11 @@ $messages[6] = __('Items deleted.');
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
 if ( !empty($_REQUEST['s']) )
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
 if ( !empty($_REQUEST['s']) )

-       printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
+       printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>

 </h2>
 
 </h2>
 

-<?php if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ) : ?>
-<div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
+<?php if ( $message ) : ?>
+<div id="message" class="updated"><p><?php echo $message; ?></p></div>

 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
 <div id="ajax-response"></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
 <div id="ajax-response"></div>


@@ -279,7 +337,7 @@ endif; ?>
 </div>
 <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
 <div class="form-wrap">
 </div>
 <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
 <div class="form-wrap">

-<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'import.php') ;?>.</p>
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.'), 'import.php') ;?></p>

 </div>
 <?php endif;
 do_action('after-' . $taxonomy . '-table', $taxonomy);
 </div>
 <?php endif;
 do_action('after-' . $taxonomy . '-table', $taxonomy);


@@ -323,12 +381,12 @@ if ( current_user_can($tax->cap->edit_terms) ) {
 
 <div class="form-wrap">
 <h3><?php echo $tax->labels->add_new_item; ?></h3>
 
 <div class="form-wrap">
 <h3><?php echo $tax->labels->add_new_item; ?></h3>

-<form id="addtag" method="post" action="edit-tags.php" class="validate">
+<form id="addtag" method="post" action="edit-tags.php" class="validate"<?php do_action( $taxonomy . '_term_new_form_tag' ); ?>>

 <input type="hidden" name="action" value="add-tag" />
 <input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
 <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="add-tag" />
 <input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />

-<?php wp_nonce_field('add-tag'); ?>
+<?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>

 
 <div class="form-field form-required">
        <label for="tag-name"><?php _ex('Name', 'Taxonomy Name'); ?></label>
 
 <div class="form-field form-required">
        <label for="tag-name"><?php _ex('Name', 'Taxonomy Name'); ?></label>


@@ -345,7 +403,20 @@ if ( current_user_can($tax->cap->edit_terms) ) {
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
 <div class="form-field">
        <label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
 <div class="form-field">
        <label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label>

-       <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'taxonomy' => $taxonomy, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
+       <?php
+       $dropdown_args = array(
+               'hide_empty'       => 0,
+               'hide_if_empty'    => false,
+               'taxonomy'         => $taxonomy,
+               'name'             => 'parent',
+               'orderby'          => 'name',
+               'hierarchical'     => true,
+               'show_option_none' => __( 'None' ),
+       );
+
+       $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy );
+       wp_dropdown_categories( $dropdown_args );
+       ?>

        <?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?>
                <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>
        <?php endif; ?>
        <?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?>
                <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>
        <?php endif; ?>


@@ -362,7 +433,7 @@ if ( ! is_taxonomy_hierarchical($taxonomy) )
        do_action('add_tag_form_fields', $taxonomy);
 do_action($taxonomy . '_add_form_fields', $taxonomy);
 
        do_action('add_tag_form_fields', $taxonomy);
 do_action($taxonomy . '_add_form_fields', $taxonomy);
 

-submit_button( $tax->labels->add_new_item, 'button' );
+submit_button( $tax->labels->add_new_item );

 
 // Back compat hooks. Deprecated in preference to {$taxonomy}_add_form
 if ( 'category' == $taxonomy )
 
 // Back compat hooks. Deprecated in preference to {$taxonomy}_add_form
 if ( 'category' == $taxonomy )


@@ -382,13 +453,13 @@ do_action($taxonomy . '_add_form', $taxonomy);
 
 </div><!-- /col-container -->
 </div><!-- /wrap -->
 
 </div><!-- /col-container -->
 </div><!-- /wrap -->

-
+<script type="text/javascript">
+try{document.forms.addtag['tag-name'].focus();}catch(e){}
+</script>

 <?php $wp_list_table->inline_edit(); ?>
 
 <?php
 break;
 }
 
 <?php $wp_list_table->inline_edit(); ?>
 
 <?php
 break;
 }
 

-include('./admin-footer.php');
-
-?>
+include( ABSPATH . 'wp-admin/admin-footer.php' );