Ticket #5418: 5418.unused-variables.diff

wp-admin/custom-header.php

@@ -224 +224 @@
                 // Save the data
                 $id = wp_insert_attachment($object, $file);
 
-                $upload = array('file' => $file, 'id' => $id);
-
                 list($width, $height, $type, $attr) = getimagesize( $file );
 
                 if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {

wp-admin/edit-link-form.php

@@ -11 +11 @@
         $nonce_action = 'add-bookmark';
 }
 
-function xfn_check($class, $value = '', $type = 'check') {
+function xfn_check($class, $value = '', $depreciated = null) {
         global $link;
 
         $link_rel = $link->link_rel;

wp-admin/includes/comment.php

@@ -8 +8 @@
 }
 
 function edit_comment() {
-        global $user_ID;
 
-        $comment_ID = (int) $_POST['comment_ID'];
         $comment_post_ID = (int) $_POST['comment_post_ID'];
 
         if (!current_user_can( 'edit_post', $comment_post_ID ))

wp-admin/includes/export.php

@@ -100 +100 @@
 function wxr_post_taxonomy() {
         $categories = get_the_category();
         $tags = get_the_tags();
-        $cat_names = array();
-        $tag_names = array();
         $the_list = '';
         $filter = 'rss';
 

wp-admin/includes/plugin.php

@@ -153 +153 @@
         global $menu;
         global $_wp_real_parent_file;
         global $_wp_submenu_nopriv;
-        global $_wp_menu_nopriv;
 
         $file = plugin_basename( $file );
 

wp-admin/includes/post.php

@@ -2 +2 @@
 
 // Update an existing post with values provided in $_POST.
 function edit_post() {
-        global $user_ID;
 
         $post_ID = (int) $_POST['post_ID'];
 
@@ -350 +349 @@
 
                 wp_cache_delete($post_ID, 'post_meta');
 
-                $result = $wpdb->query( "
-                                                INSERT INTO $wpdb->postmeta
-                                                (post_id,meta_key,meta_value )
-                                                VALUES ('$post_ID','$metakey','$metavalue' )
-                                        " );
+                $wpdb->query( "
+                                INSERT INTO $wpdb->postmeta
+                                (post_id,meta_key,meta_value )
+                                VALUES ('$post_ID','$metakey','$metavalue' )
+                        " );
                 return $wpdb->insert_id;
         }
         return false;
@@ -428 +427 @@
 
 // Replace hrefs of attachment anchors with up-to-date permalinks.
 function _fix_attachment_links( $post_ID ) {
-        global $wp_rewrite;
 
         $post = & get_post( $post_ID, ARRAY_A );
 

wp-admin/includes/template.php

@@ -40 +40 @@
         if ( current_user_can( 'manage_categories' ) ) {
                 $edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->term_id' class='edit'>".__( 'Edit' )."</a></td>";
                 $default_cat_id = (int) get_option( 'default_category' );
-                $default_link_cat_id = (int) get_option( 'default_link_category' );
 
                 if ( $category->term_id != $default_cat_id )
                         $edit .= "<td><a href='" . wp_nonce_url( "categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id ) . "' class='delete:the-list:cat-$category->term_id delete'>".__( 'Delete' )."</a>";
@@ -90 +89 @@
         $count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
         $output = "<tr id='link-cat-$category->term_id'$class>
                 <th scope='row' style='text-align: center'>$category->term_id</th>
-                <td>" . ( $name_override ? $name_override : $pad . ' ' . $category->name ) . "</td>
+                <td>" . ( $name_override ? $name_override : $category->name ) . "</td>
                 <td>$category->description</td>
                 <td align='center'>$count</td>
                 <td>$edit</td>\n\t</tr>\n";
@@ -125 +124 @@
 }
 
 function get_nested_categories( $default = 0, $parent = 0 ) {
-        global $post_ID, $mode, $wpdb, $checked_categories;
+        global $post_ID, $wpdb, $checked_categories;
 
         if ( empty($checked_categories) ) {
                 if ( $post_ID ) {
@@ -390 +389 @@
 }
 
 function list_meta( $meta ) {
-        global $post_ID;
         // Exit if no meta
         if (!$meta ) {
                 echo '<tbody id="the-list" class="list:meta"><tr style="display: none;"><td>&nbsp;</td></tr></tbody>'; //TBODY needed for list-manipulation JS
@@ -433 +431 @@
                 }
         }
 
-        $key_js = js_escape( $entry['meta_key'] );
         $entry['meta_key']   = attribute_escape($entry['meta_key']);
         $entry['meta_value'] = attribute_escape($entry['meta_value']);
         $entry['meta_id'] = (int) $entry['meta_id'];

wp-admin/includes/upload.php

@@ -78 +78 @@
 }
 
 function wp_upload_view() {
-        global $style, $post_id, $style;
+        global $style, $style;
         $id = get_the_ID();
         $attachment_data = wp_get_attachment_metadata( $id );
 ?>
@@ -268 +268 @@
                 $url = $file['url'];
                 $type = $file['type'];
                 $file = $file['file'];
-                $filename = basename($file);
 
                 // Construct the attachment array
                 $attachment = array(

wp-admin/includes/user.php

@@ -187 +187 @@
 
 function get_others_unpublished_posts($user_id, $type='any') {
         global $wpdb;
-        $user = get_userdata( $user_id );
-        $level_key = $wpdb->prefix . 'user_level';
 
         $editable = get_editable_user_ids( $user_id );
 
@@ -246 +244 @@
         global $wpdb;
 
         $id = (int) $id;
-        $user = get_userdata($id);
 
         if ($reassign == 'novalue') {
                 $post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_author = $id");