Ticket #32444: 32444.2.diff

src/wp-admin/includes/image.php

@@ -190 +190 @@
         }
 
         // Remove the blob of binary data from the array.
-        if ( isset( $metadata['image']['data'] ) )
-                unset( $metadata['image']['data'] );
+        unset( $metadata['image']['data'] );
 
         /**
          * Filter the generated attachment meta data.

src/wp-admin/includes/media.php

@@ -355 +355 @@
         ), $post_data );
 
         // This should never be set as it would then overwrite an existing attachment.
-        if ( isset( $attachment['ID'] ) )
-                unset( $attachment['ID'] );
+        unset( $attachment['ID'] );
 
         // Save the data
         $id = wp_insert_attachment($attachment, $file, $post_id);
@@ -419 +418 @@
         ), $post_data );
 
         // This should never be set as it would then overwrite an existing attachment.
-        if ( isset( $attachment['ID'] ) )
-                unset( $attachment['ID'] );
+        unset( $attachment['ID'] );
 
         // Save the attachment metadata
         $id = wp_insert_attachment($attachment, $file, $post_id);

src/wp-admin/includes/nav-menu.php

@@ -1280 +1280 @@
 
                         $menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
 
-                        if ( is_wp_error( $menu_item_db_id ) )
+                        if ( is_wp_error( $menu_item_db_id ) ) {
                                 $messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
-                        elseif ( isset( $menu_items[$menu_item_db_id] ) )
-                                unset( $menu_items[$menu_item_db_id] );
+                        } else {
+                                unset( $menu_items[ $menu_item_db_id ] );
+                        }
                 }
         }
 

src/wp-includes/class-wp-embed.php

@@ -109 +109 @@
          * @param int $priority Optional. The priority of the handler to be removed (default: 10).
          */
         public function unregister_handler( $id, $priority = 10 ) {
-                if ( isset($this->handlers[$priority][$id]) )
-                        unset($this->handlers[$priority][$id]);
+                unset( $this->handlers[ $priority ][ $id ] );
         }
 
         /**

src/wp-includes/class-wp-walker.php

@@ -408 +408 @@
                         foreach ( (array) $children_elements[$id] as $child )
                                 $this->unset_children( $child, $children_elements );
 
-                if ( isset($children_elements[$id]) )
-                        unset( $children_elements[$id] );
-
+                unset( $children_elements[ $id ] );
         }
 
 } // Walker

src/wp-includes/general-template.php

@@ -2668 +2668 @@
 
                 // Remove the format argument from the array of query arguments, to avoid overwriting custom format.
                 foreach ( $format_args as $format_arg => $format_arg_value ) {
-                        if ( isset( $url_query_args[ $format_arg ] ) ) {
-                                unset( $url_query_args[ $format_arg ] );
-                        }
+                        unset( $url_query_args[ $format_arg ] );
                 }
 
                 $args['add_args'] = array_merge( $args['add_args'], urlencode_deep( $url_query_args ) );

src/wp-includes/plugin.php

@@ -332 +332 @@
                 }
         }
 
-        if ( isset( $merged_filters[ $tag ] ) ) {
-                unset( $merged_filters[ $tag ] );
-        }
+        unset( $merged_filters[ $tag ] );
 
         return true;
 }

src/wp-includes/post.php

@@ -1755 +1755 @@
 function remove_post_type_support( $post_type, $feature ) {
         global $_wp_post_type_features;
 
-        if ( isset( $_wp_post_type_features[$post_type][$feature] ) )
-                unset( $_wp_post_type_features[$post_type][$feature] );
+        unset( $_wp_post_type_features[ $post_type ][ $feature ] );
 }
 
 /**

src/wp-includes/widgets.php

@@ -569 +569 @@
          * @param string $widget_class The name of a {@see WP_Widget} subclass.
          */
         public function unregister( $widget_class ) {
-                if ( isset($this->widgets[$widget_class]) )
-                        unset($this->widgets[$widget_class]);
+                unset( $this->widgets[ $widget_class ] );
         }
 
         /**
@@ -851 +850 @@
 function unregister_sidebar( $name ) {
         global $wp_registered_sidebars;
 
-        if ( isset( $wp_registered_sidebars[$name] ) )
-                unset( $wp_registered_sidebars[$name] );
+        unset( $wp_registered_sidebars[ $name ] );
 }
 
 /**
@@ -893 +891 @@
 
         $id_base = _get_widget_id_base($id);
         if ( in_array($output_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($output_callback) ) {
-                if ( isset($wp_registered_widget_controls[$id]) )
-                        unset($wp_registered_widget_controls[$id]);
-
-                if ( isset($wp_registered_widget_updates[$id_base]) )
-                        unset($wp_registered_widget_updates[$id_base]);
-
+                unset( $wp_registered_widget_controls[ $id ] );
+                unset( $wp_registered_widget_updates[ $id_base ] );
                 return;
         }
 
@@ -1024 +1018 @@
         }
 
         if ( in_array($control_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($control_callback) ) {
-                if ( isset($wp_registered_widgets[$id]) )
-                        unset($wp_registered_widgets[$id]);
-
+                unset( $wp_registered_widgets[ $id ] );
                 return;
         }