Changeset 32545

Timestamp:

05/22/2015 05:46:47 AM (10 years ago)

Author:

wonderboymusic

Message:

When calling unset(), it is unnecessary to immediately precede it with a call to isset().

See #32444.

Location:

trunk/src

Files:

• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-includes/class-wp-embed.php (modified) (1 diff)
• wp-includes/class-wp-walker.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/plugin.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (4 diffs)

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

@@ -191 +191 @@
 
     // Remove the blob of binary data from the array.
-    if ( isset( $metadata['image']['data'] ) )
-        unset( $metadata['image']['data'] );
+    unset( $metadata['image']['data'] );
 
     /**

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

@@ -356 +356 @@
 
     // 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
@@ -420 +419 @@
 
     // 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

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

@@ -1281 +1281 @@
             $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 ] );
+            }
         }
     }

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

@@ -110 +110 @@
      */
     public function unregister_handler( $id, $priority = 10 ) {
-        if ( isset($this->handlers[$priority][$id]) )
-            unset($this->handlers[$priority][$id]);
+        unset( $this->handlers[ $priority ][ $id ] );
     }
 

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

@@ -409 +409 @@
                 $this->unset_children( $child, $children_elements );
 
-        if ( isset($children_elements[$id]) )
-            unset( $children_elements[$id] );
-
+        unset( $children_elements[ $id ] );
     }
 

trunk/src/wp-includes/general-template.php

@@ -2669 +2669 @@
         // 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 ] );
         }
 

trunk/src/wp-includes/plugin.php

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

trunk/src/wp-includes/post.php

@@ -1756 +1756 @@
     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 ] );
 }
 

trunk/src/wp-includes/widgets.php

@@ -570 +570 @@
      */
     public function unregister( $widget_class ) {
-        if ( isset($this->widgets[$widget_class]) )
-            unset($this->widgets[$widget_class]);
+        unset( $this->widgets[ $widget_class ] );
     }
 
@@ -852 +851 @@
     global $wp_registered_sidebars;
 
-    if ( isset( $wp_registered_sidebars[$name] ) )
-        unset( $wp_registered_sidebars[$name] );
+    unset( $wp_registered_sidebars[ $name ] );
 }
 
@@ -894 +892 @@
     $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;
     }
@@ -1025 +1019 @@
 
     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;
     }