Changeset 23445

Timestamp:

02/16/2013 06:28:41 PM (12 years ago)

Author:

nacin

Message:

Remove unused variables reset by wp_reset_vars(). Many of these haven't been used since b2. see #21767.

Location:

trunk/wp-admin

Files:

• admin.php (modified) (1 diff)
• edit-link-form.php (modified) (1 diff)
• includes/bookmark.php (modified) (1 diff)
• includes/class-wp-links-list-table.php (modified) (1 diff)
• link-add.php (modified) (1 diff)
• link.php (modified) (1 diff)
• options-head.php (modified) (2 diffs)
• post.php (modified) (1 diff)
• user-edit.php (modified) (2 diffs)

trunk/wp-admin/admin.php

@@ -78 +78 @@
 $time_format = get_option('time_format');
 
-wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));
-
 wp_enqueue_script( 'common' );
 

trunk/wp-admin/edit-link-form.php

@@ -127 +127 @@
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
-<input type="hidden" name="order_by" value="<?php echo esc_attr($order_by); ?>" />
 <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
 <?php else: ?>

trunk/wp-admin/includes/bookmark.php

@@ -56 +56 @@
     $link = new stdClass;
     if ( isset( $_GET['linkurl'] ) )
-        $link->link_url = esc_url( $_GET['linkurl'] );
+        $link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
     else
         $link->link_url = '';
 
     if ( isset( $_GET['name'] ) )
-        $link->link_name = esc_attr( $_GET['name'] );
+        $link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
     else
         $link->link_name = '';

trunk/wp-admin/includes/class-wp-links-list-table.php

@@ -24 +24 @@
         global $cat_id, $s, $orderby, $order;
 
-        wp_reset_vars( array( 'action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'orderby', 'order', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]', 's' ) );
+        wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
 
         $args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );

trunk/wp-admin/link-add.php

@@ -16 +16 @@
 $parent_file = 'link-manager.php';
 
-wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
-    'description', 'visible', 'target', 'category', 'link_id',
-    'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
-    'notes', 'linkcheck[]'));
+wp_reset_vars( array('action', 'cat_id', 'link_id' ) );
 
 wp_enqueue_script('link');

trunk/wp-admin/link.php

@@ -13 +13 @@
 require_once ('admin.php');
 
-wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
+wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
 
 if ( ! current_user_can('manage_links') )

trunk/wp-admin/options-head.php

@@ -3 +3 @@
  * WordPress Options Header.
  *
- * Resets variables: 'action', 'standalone', and 'option_group_id'. Displays
- * updated message, if updated variable is part of the URL query.
+ * Displays updated message, if updated variable is part of the URL query.
  *
  * @package WordPress
@@ -10 +9 @@
  */
 
-wp_reset_vars(array('action', 'standalone', 'option_group_id'));
+wp_reset_vars( array( 'action' ) );
 
 if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {

trunk/wp-admin/post.php

@@ -15 +15 @@
 $submenu_file = 'edit.php';
 
-wp_reset_vars(array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder'));
+wp_reset_vars( array( 'action' ) );
 
 if ( isset( $_GET['post'] ) )

trunk/wp-admin/user-edit.php

@@ -10 +10 @@
 require_once('./admin.php');
 
-wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer'));
+wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
 
 $user_id = (int) $user_id;
@@ -55 +55 @@
 );
 
-$wp_http_referer = remove_query_arg(array('update', 'delete_count'), wp_unslash( $wp_http_referer ) );
+$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer );
 
 $user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );