WordPress 4.7.1-scripts

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

diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 94a26bbdd29d6450fa98286e8def9fcd8848ef8b..d233b3091ee36cecb6e8ae4ef130c033ac354890 100644 (file)
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -7,13 +7,8 @@
  */
 
 // don't load directly
  */
 
 // don't load directly

-if ( !defined('ABSPATH') )
-       die('-1');
-
-if ( empty($tag_ID) ) { ?>
-       <div id="message" class="updated"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
-<?php
-       return;
+if ( ! defined( 'ABSPATH' ) ) {
+       die( '-1' );

 }
 
 // Back compat hooks
 }
 
 // Back compat hooks


@@ -48,6 +43,17 @@ if ( 'category' == $taxonomy ) {
         */
        do_action( 'edit_tag_form_pre', $tag );
 }
         */
        do_action( 'edit_tag_form_pre', $tag );
 }

+
+/**
+ * Use with caution, see https://codex.wordpress.org/Function_Reference/wp_reset_vars
+ */
+wp_reset_vars( array( 'wp_http_referer' ) );
+
+$wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer );
+
+/** Also used by Edit Tags */
+require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
+

 /**
  * Fires before the Edit Term form for all taxonomies.
  *
 /**
  * Fires before the Edit Term form for all taxonomies.
  *


@@ -62,24 +68,53 @@ if ( 'category' == $taxonomy ) {
 do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 
 <div class="wrap">
 do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 
 <div class="wrap">

-<h2><?php echo $tax->labels->edit_item; ?></h2>
+<h1><?php echo $tax->labels->edit_item; ?></h1>
+
+<?php if ( $message ) : ?>
+<div id="message" class="updated">
+       <p><strong><?php echo $message; ?></strong></p>
+       <?php if ( $wp_http_referer ) { ?>
+       <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php
+               /* translators: %s: taxonomy name */
+               printf( _x( '&larr; Back to %s', 'admin screen' ), $tax->labels->name );
+       ?></a></p>
+       <?php } ?>
+</div>
+<?php endif; ?>
+

 <div id="ajax-response"></div>
 <div id="ajax-response"></div>

-<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"
-<?php
+
+<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"<?php

 /**
  * Fires inside the Edit Term form tag.
  *
 /**
  * Fires inside the Edit Term form tag.
  *

- * The dynamic portion of the hook name, `$taxonomy`, refers to
- * the taxonomy slug.
+ * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.

  *
  * @since 3.7.0
  */
 do_action( "{$taxonomy}_term_edit_form_tag" );
 ?>>
  *
  * @since 3.7.0
  */
 do_action( "{$taxonomy}_term_edit_form_tag" );
 ?>>

-<input type="hidden" name="action" value="editedtag" />
-<input type="hidden" name="tag_ID" value="<?php echo esc_attr($tag->term_id) ?>" />
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy) ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
+<input type="hidden" name="action" value="editedtag"/>
+<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_ID ) ?>"/>
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ) ?>"/>
+<?php
+wp_original_referer_field( true, 'previous' );
+wp_nonce_field( 'update-tag_' . $tag_ID );
+
+/**
+ * Fires at the beginning of the Edit Term form.
+ *
+ * At this point, the required hidden fields and nonces have already been output.
+ *
+ * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+ *
+ * @since 4.5.0
+ *
+ * @param object $tag      Current taxonomy term object.
+ * @param string $taxonomy Current $taxonomy slug.
+ */
+do_action( "{$taxonomy}_term_edit_form_top", $tag, $taxonomy );
+?>

        <table class="form-table">
                <tr class="form-field form-required term-name-wrap">
                        <th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
        <table class="form-table">
                <tr class="form-field form-required term-name-wrap">
                        <th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>


@@ -91,14 +126,21 @@ do_action( "{$taxonomy}_term_edit_form_tag" );
                        <th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
                        <?php
                        /**
                        <th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
                        <?php
                        /**

-                        * Filter the editable term slug.
+                        * Filters the editable slug.
+                        *
+                        * Note: This is a multi-use hook in that it is leveraged both for editable
+                        * post URIs and term slugs.

                         *
                         * @since 2.6.0
                         *
                         * @since 2.6.0

+                        * @since 4.4.0 The `$tag` parameter was added.

                         *
                         *

-                        * @param string $slug The current term slug.
+                        * @param string         $slug The editable slug. Will be either a term slug or post URI depending
+                        *                             upon the context in which it is evaluated.
+                        * @param object|WP_Post $tag  Term or WP_Post object.

                         */
                         */

+                       $slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : '';

                        ?>
                        ?>

-                       <td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo esc_attr( apply_filters( 'editable_slug', $tag->slug ) ); ?>" size="40" />
+                       <td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />

                        <p 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.'); ?></p></td>
                </tr>
 <?php } ?>
                        <p 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.'); ?></p></td>
                </tr>
 <?php } ?>


@@ -106,7 +148,22 @@ do_action( "{$taxonomy}_term_edit_form_tag" );
                <tr class="form-field term-parent-wrap">
                        <th scope="row"><label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label></th>
                        <td>
                <tr class="form-field term-parent-wrap">
                        <th scope="row"><label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label></th>
                        <td>

-                               <?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude_tree' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
+                               <?php
+                               $dropdown_args = array(
+                                       'hide_empty'       => 0,
+                                       'hide_if_empty'    => false,
+                                       'taxonomy'         => $taxonomy,
+                                       'name'             => 'parent',
+                                       'orderby'          => 'name',
+                                       'selected'         => $tag->parent,
+                                       'exclude_tree'     => $tag->term_id,
+                                       'hierarchical'     => true,
+                                       'show_option_none' => __( 'None' ),
+                               );
+
+                               /** This filter is documented in wp-admin/edit-tags.php */
+                               $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
+                               wp_dropdown_categories( $dropdown_args ); ?>

                                <?php if ( 'category' == $taxonomy ) : ?>
                                <p 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.'); ?></p>
                                <?php endif; ?>
                                <?php if ( 'category' == $taxonomy ) : ?>
                                <p 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.'); ?></p>
                                <?php endif; ?>