WordPress 4.4

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

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 8375202df25bd367f3d05cffe8b3e8a1b3bd8ccd..6ff9e3741968ad23d647c49e59da4a8184636e15 100644 (file)
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** WordPress Administration Bootstrap */

-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( ! $taxnow )
        wp_die( __( 'Invalid taxonomy' ) );
 
 if ( ! $taxnow )
        wp_die( __( 'Invalid taxonomy' ) );


@@ -17,8 +17,24 @@ $tax = get_taxonomy( $taxnow );
 if ( ! $tax )
        wp_die( __( 'Invalid taxonomy' ) );
 
 if ( ! $tax )
        wp_die( __( 'Invalid taxonomy' ) );
 

-if ( ! current_user_can( $tax->cap->manage_terms ) )
-       wp_die( __( 'Cheatin’ uh?' ) );
+if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
+   wp_die( __( 'You are not allowed to manage these items.' ) );
+}
+
+if ( ! current_user_can( $tax->cap->manage_terms ) ) {
+       wp_die(
+               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+               '<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
+               403
+       );
+}
+
+/**
+ * $post_type is set when the WP_Terms_List_Table instance is created
+ *
+ * @global string $post_type
+ */
+global $post_type;

 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');
 $pagenum = $wp_list_table->get_pagenum();


@@ -28,7 +44,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&amp;post_type=$post_type";
 if ( 'post' != $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 ) {
+} elseif ( 'link_category' == $tax->name ) {

        $parent_file = 'link-manager.php';
        $submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {
        $parent_file = 'link-manager.php';
        $submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {


@@ -36,7 +52,15 @@ 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( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
+
+get_current_screen()->set_screen_reader_content( array(
+       'heading_pagination' => $tax->labels->items_list_navigation,
+       'heading_list'       => $tax->labels->items_list,
+) );
+
+$location = false;
+$referer = wp_get_referer();

 
 switch ( $wp_list_table->current_action() ) {
 
 
 switch ( $wp_list_table->current_action() ) {
 


@@ -44,60 +68,70 @@ case 'add-tag':
 
        check_admin_referer( 'add-tag', '_wpnonce_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(
+                       '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                       '<p>' . __( 'You are not allowed to add this item.' ) . '</p>',
+                       403
+               );
+       }

 
        $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
        $location = 'edit-tags.php?taxonomy=' . $taxonomy;
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;
 
 
        $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
        $location = 'edit-tags.php?taxonomy=' . $taxonomy;
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;
 

-       if ( $referer = wp_get_original_referer() ) {
-               if ( false !== strpos( $referer, 'edit-tags.php' ) )
-                       $location = $referer;
+       if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+               $location = $referer;

        }
 
        if ( $ret && !is_wp_error( $ret ) )
                $location = add_query_arg( 'message', 1, $location );
        else
        }
 
        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;
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;
 
 case 'delete':
        $location = 'edit-tags.php?taxonomy=' . $taxonomy;
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;

-       if ( $referer = wp_get_referer() ) {
-               if ( false !== strpos( $referer, 'edit-tags.php' ) )
-                       $location = $referer;
+
+       if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+               $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 );
 
        }
 
        $tag_ID = (int) $_REQUEST['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(
+                       '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                       '<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
+                       403
+               );
+       }

 
        wp_delete_term( $tag_ID, $taxonomy );
 
        $location = add_query_arg( 'message', 2, $location );
 
        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' );
 
 
 case 'bulk-delete':
        check_admin_referer( 'bulk-tags' );
 

-       if ( !current_user_can( $tax->cap->delete_terms ) )
-               wp_die( __( 'Cheatin&#8217; uh?' ) );
+       if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+               wp_die(
+                       '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                       '<p>' . __( 'You are not allowed to delete these items.' ) . '</p>',
+                       403
+               );
+       }

 
        $tags = (array) $_REQUEST['delete_tags'];
        foreach ( $tags as $tag_ID ) {
 
        $tags = (array) $_REQUEST['delete_tags'];
        foreach ( $tags as $tag_ID ) {


@@ -107,16 +141,13 @@ case 'bulk-delete':
        $location = 'edit-tags.php?taxonomy=' . $taxonomy;
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;
        $location = 'edit-tags.php?taxonomy=' . $taxonomy;
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;

-       if ( $referer = wp_get_referer() ) {
-               if ( false !== strpos( $referer, 'edit-tags.php' ) )
-                       $location = $referer;
+       if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+               $location = $referer;

        }
 
        $location = add_query_arg( 'message', 6, $location );
        }
 
        $location = add_query_arg( 'message', 6, $location );

-       wp_redirect( $location );
-       exit;

 
 

-break;
+       break;

 
 case 'edit':
        $title = $tax->labels->edit_item;
 
 case 'edit':
        $title = $tax->labels->edit_item;


@@ -126,17 +157,23 @@ case 'edit':
        $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
        if ( ! $tag )
                wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
        $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
        if ( ! $tag )
                wp_die( __( 'You attempted to edit an item that doesn&#8217;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' );
+       include( ABSPATH . 'wp-admin/admin-footer.php' );

 
 

-break;
+       exit;

 
 case 'editedtag':
        $tag_ID = (int) $_POST['tag_ID'];
        check_admin_referer( 'update-tag_' . $tag_ID );
 
 
 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&#8217; uh?' ) );
+       if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+               wp_die(
+                       '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                       '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
+                       403
+               );
+       }

 
        $tag = get_term( $tag_ID, $taxonomy );
        if ( ! $tag )
 
        $tag = get_term( $tag_ID, $taxonomy );
        if ( ! $tag )


@@ -148,27 +185,25 @@ case 'editedtag':
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;
 
        if ( 'post' != $post_type )
                $location .= '&post_type=' . $post_type;
 

-       if ( $referer = wp_get_original_referer() ) {
-               if ( false !== strpos( $referer, 'edit-tags.php' ) )
-                       $location = $referer;
+       if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+               $location = $referer;

        }
 
        if ( $ret && !is_wp_error( $ret ) )
                $location = add_query_arg( 'message', 3, $location );
        else
        }
 
        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']) );
        $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;
 }
        wp_redirect( $location );
        exit;
 }


@@ -212,15 +247,15 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
                        $help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
 
                $help .= '<ul>' .
                        $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>';
+               '<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';

 
                if ( ! global_terms_enabled() )
 
                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>';
+                       $help .= '<li>' . __( '<strong>Slug</strong> &mdash; 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 )
 
                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>';
+                       $help .= '<li>' . __( '<strong>Parent</strong> &mdash; 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>';

 
 

-               $help .= '<li>' . __( '<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
+               $help .= '<li>' . __( '<strong>Description</strong> &mdash; 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>';
 
                '</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>';
 


@@ -234,47 +269,55 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
        $help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 
        if ( 'category' == $taxonomy )
        $help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 
        if ( 'category' == $taxonomy )

-               $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>' ) . '</p>';
+               $help .= '<p>' . __( '<a href="https://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_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
+               $help .= '<p>' . __( '<a href="https://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_Tags_Screen" target="_blank">Documentation on Tags</a>' ) . '</p>';
+               $help .= '<p>' . __( '<a href="https://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="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';

 
        get_current_screen()->set_help_sidebar( $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(
+               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+               '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
+               403
+       );
+}
+
+/** Also used by the Edit Tag  form */
+require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );

 
 

-if ( !current_user_can($tax->cap->edit_terms) )
-       wp_die( __('You are not allowed to edit this item.') );
+$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated';

 
 

-$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.');
+if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
+       $import_link = admin_url( 'admin.php?import=wpcat2tag' );
+} else {
+       $import_link = admin_url( 'import.php' );
+}

 
 ?>
 
 <div class="wrap nosubsub">
 
 ?>
 
 <div class="wrap nosubsub">

-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title );
+<h1><?php echo esc_html( $title );

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

-</h2>
+</h1>

 
 

-<?php if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['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']);
+<?php if ( $message ) : ?>
+<div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );

 endif; ?>
 <div id="ajax-response"></div>
 
 endif; ?>
 <div id="ajax-response"></div>
 

-<form class="search-form" action="" method="get">
+<form class="search-form" 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); ?>" />
 
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 


@@ -287,7 +330,7 @@ endif; ?>
 
 <div id="col-right">
 <div class="col-wrap">
 
 <div id="col-right">
 <div class="col-wrap">

-<form id="posts-filter" action="" method="post">
+<form id="posts-filter" method="post">

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


@@ -298,17 +341,37 @@ endif; ?>
 
 <?php if ( 'category' == $taxonomy ) : ?>
 <div class="form-wrap">
 
 <?php if ( 'category' == $taxonomy ) : ?>
 <div class="form-wrap">

-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
+<p>
+       <?php
+       echo '<strong>' . __( 'Note:' ) . '</strong><br />';
+       printf(
+               /* translators: %s: default category */
+               __( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ),
+               /** This filter is documented in wp-includes/category-template.php */
+               '<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '</strong>'
+       );
+       ?>
+</p>

 <?php if ( current_user_can( 'import' ) ) : ?>
 <?php if ( current_user_can( 'import' ) ) : ?>

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

 <?php endif; ?>
 </div>
 <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
 <div class="form-wrap">
 <?php endif; ?>
 </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>.' ), esc_url( $import_link ) ) ;?></p>

 </div>
 <?php endif;
 </div>
 <?php endif;

-do_action('after-' . $taxonomy . '-table', $taxonomy);
+
+/**
+ * Fires after the taxonomy list table.
+ *
+ * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+ *
+ * @since 3.0.0
+ *
+ * @param string $taxonomy The taxonomy name.
+ */
+do_action( "after-{$taxonomy}-table", $taxonomy );

 ?>
 
 </div>
 ?>
 
 </div>


@@ -321,14 +384,14 @@ do_action('after-' . $taxonomy . '-table', $taxonomy);
 
 if ( !is_null( $tax->labels->popular_items ) ) {
        if ( current_user_can( $tax->cap->edit_terms ) )
 
 if ( !is_null( $tax->labels->popular_items ) ) {
        if ( current_user_can( $tax->cap->edit_terms ) )

-               $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) );
+               $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit' ) );

        else
                $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
 
        if ( $tag_cloud ) :
        ?>
 <div class="tagcloud">
        else
                $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
 
        if ( $tag_cloud ) :
        ?>
 <div class="tagcloud">

-<h3><?php echo $tax->labels->popular_items; ?></h3>
+<h2><?php echo $tax->labels->popular_items; ?></h2>

 <?php echo $tag_cloud; unset( $tag_cloud ); ?>
 </div>
 <?php
 <?php echo $tag_cloud; unset( $tag_cloud ); ?>
 </div>
 <?php


@@ -336,69 +399,198 @@ endif;
 }
 
 if ( current_user_can($tax->cap->edit_terms) ) {
 }
 
 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 );

 ?>
 
 <div class="form-wrap">
 ?>
 
 <div class="form-wrap">

-<h3><?php echo $tax->labels->add_new_item; ?></h3>
-<form id="addtag" method="post" action="edit-tags.php" class="validate">
+<h2><?php echo $tax->labels->add_new_item; ?></h2>
+<form id="addtag" method="post" action="edit-tags.php" class="validate"
+<?php
+/**
+ * Fires at the beginning of the Add Tag form.
+ *
+ * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+ *
+ * @since 3.7.0
+ */
+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); ?>" />
 <?php wp_nonce_field('add-tag', '_wpnonce_add-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); ?>" />
 <?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 term-name-wrap">
+       <label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label>

        <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
        <p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
 <?php if ( ! global_terms_enabled() ) : ?>
        <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
        <p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
 <?php if ( ! global_terms_enabled() ) : ?>

-<div class="form-field">
-       <label for="tag-slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label>
+<div class="form-field term-slug-wrap">
+       <label for="tag-slug"><?php _e( 'Slug' ); ?></label>

        <input name="slug" id="tag-slug" 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 endif; // global_terms_enabled() ?>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
        <input name="slug" id="tag-slug" 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 endif; // global_terms_enabled() ?>
 <?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'))); ?>
+<div class="form-field term-parent-wrap">
+       <label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label>
+       <?php
+       $dropdown_args = array(
+               'hide_empty'       => 0,
+               'hide_if_empty'    => false,
+               'taxonomy'         => $taxonomy,
+               'name'             => 'parent',
+               'orderby'          => 'name',
+               'hierarchical'     => true,
+               'show_option_none' => __( 'None' ),
+       );
+
+       /**
+        * Filter the taxonomy parent drop-down on the Edit Term page.
+        *
+        * @since 3.7.0
+        * @since 4.2.0 Added `$context` parameter.
+        *
+        * @param array  $dropdown_args {
+        *     An array of taxonomy parent drop-down arguments.
+        *
+        *     @type int|bool $hide_empty       Whether to hide terms not attached to any posts. Default 0|false.
+        *     @type bool     $hide_if_empty    Whether to hide the drop-down if no terms exist. Default false.
+        *     @type string   $taxonomy         The taxonomy slug.
+        *     @type string   $name             Value of the name attribute to use for the drop-down select element.
+        *                                      Default 'parent'.
+        *     @type string   $orderby          The field to order by. Default 'name'.
+        *     @type bool     $hierarchical     Whether the taxonomy is hierarchical. Default true.
+        *     @type string   $show_option_none Label to display if there are no terms. Default 'None'.
+        * }
+        * @param string $taxonomy The taxonomy slug.
+        * @param string $context  Filter context. Accepts 'new' or 'edit'.
+        */
+       $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
+
+       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; ?>
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>
        <?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; ?>
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>

-<div class="form-field">
-       <label for="tag-description"><?php _ex('Description', 'Taxonomy Description'); ?></label>
+<div class="form-field term-description-wrap">
+       <label for="tag-description"><?php _e( 'Description' ); ?></label>

        <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
        <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>
 
 <?php
        <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
        <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>
 
 <?php

-if ( ! is_taxonomy_hierarchical($taxonomy) )
-       do_action('add_tag_form_fields', $taxonomy);
-do_action($taxonomy . '_add_form_fields', $taxonomy);
+if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+       /**
+        * Fires after the Add Tag form fields for non-hierarchical taxonomies.
+        *
+        * @since 3.0.0
+        *
+        * @param string $taxonomy The taxonomy slug.
+        */
+       do_action( 'add_tag_form_fields', $taxonomy );
+}
+
+/**
+ * Fires after the Add Term form fields.
+ *
+ * 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}_add_form_fields", $taxonomy );

 
 submit_button( $tax->labels->add_new_item );
 
 
 submit_button( $tax->labels->add_new_item );
 

-// Back compat hooks. Deprecated in preference to {$taxonomy}_add_form
-if ( 'category' == $taxonomy )
-       do_action('edit_category_form', (object)array('parent' => 0) );
-elseif ( 'link_category' == $taxonomy )
-       do_action('edit_link_category_form', (object)array('parent' => 0) );
-else
-       do_action('add_tag_form', $taxonomy);
+if ( 'category' == $taxonomy ) {
+       /**
+        * Fires at the end of the Edit Category form.
+        *
+        * @since 2.1.0
+        * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+        *
+        * @param object $arg Optional arguments cast to an object.
+        */
+       do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
+} elseif ( 'link_category' == $taxonomy ) {
+       /**
+        * Fires at the end of the Edit Link form.
+        *
+        * @since 2.3.0
+        * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+        *
+        * @param object $arg Optional arguments cast to an object.
+        */
+       do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
+} else {
+       /**
+        * Fires at the end of the Add Tag form.
+        *
+        * @since 2.7.0
+        * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+        *
+        * @param string $taxonomy The taxonomy slug.
+        */
+       do_action( 'add_tag_form', $taxonomy );
+}

 
 

-do_action($taxonomy . '_add_form', $taxonomy);
+/**
+ * Fires at the end of 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}_add_form", $taxonomy );

 ?>
 </form></div>
 <?php } ?>
 ?>
 </form></div>
 <?php } ?>


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

+
+<?php if ( ! wp_is_mobile() ) : ?>

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

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

 <?php
 <?php

-break;
-}
+endif;
+
+$wp_list_table->inline_edit();

 
 

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