Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-20 19:41:28 +02:00
Code Issues Projects Releases Wiki Activity

When editing terms, properly display an admin notice-warning when tag_ID is empty.

Browse Source 
Also, avoids two related PHP notices when empty or not set (and thus the global `$tag` is a WP_Error object).

Fixes: #34515.
Built from https://develop.svn.wordpress.org/trunk@35875


git-svn-id: http://core.svn.wordpress.org/trunk@35839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2015-12-11 22:49:41 +00:00
parent 1294c2bc3a
commit 24afea92c2
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/edit-tag-form.php
View File

@ -11,7 +11,10 @@ if ( !defined('ABSPATH') )
die('-1'); die('-1');
if ( empty($tag_ID) ) { ?> if ( empty($tag_ID) ) { ?>
<div id="message" class="updated notice is-dismissible"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div> <div class="wrap">
<h1><?php echo $tax->labels->edit_item; ?></h1>
<div id="message" class="notice notice-warning"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
</div>
<?php <?php
return; return;
} }

4
wp-admin/edit-tags.php
View File

@ -152,6 +152,10 @@ case 'bulk-delete':
case 'edit': case 'edit':
$title = $tax->labels->edit_item; $title = $tax->labels->edit_item;
if ( ! isset( $_REQUEST['tag_ID'] ) ) {
break;
}
$tag_ID = (int) $_REQUEST['tag_ID']; $tag_ID = (int) $_REQUEST['tag_ID'];
$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' ); $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );

2
wp-includes/admin-bar.php
View File

@ -574,7 +574,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
) ); ) );
} }
} elseif ( 'edit-tags' == $current_screen->base } elseif ( 'edit-tags' == $current_screen->base
&& isset( $tag ) && is_object( $tag ) && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
&& ( $tax = get_taxonomy( $tag->taxonomy ) ) && ( $tax = get_taxonomy( $tag->taxonomy ) )
&& $tax->public ) && $tax->public )
{ {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-35874'; $wp_version = '4.5-alpha-35875';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.