Changeset 35875

Timestamp:

12/11/2015 10:48:49 PM (11 years ago)

Author:

afercia

Message:

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

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

Fixes: #34515.

Location:

trunk/src

Files:

• wp-admin/edit-tag-form.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)

trunk/src/wp-admin/edit-tag-form.php

@@ -12 +12 @@
 
 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
         return;

trunk/src/wp-admin/edit-tags.php

@@ -152 +152 @@
 case 'edit':
         $title = $tax->labels->edit_item;
+
+        if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+                break;
+        }
 
         $tag_ID = (int) $_REQUEST['tag_ID'];

trunk/src/wp-includes/admin-bar.php

@@ -575 +575 @@
                         }
                 } 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->public )