<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23445] trunk/wp-admin: Remove unused variables reset by wp_reset_vars().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23445">23445</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-02-16 18:28:41 +0000 (Sat, 16 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused variables reset by wp_reset_vars(). Many of these haven't been used since b2. see <a href="http://core.trac.wordpress.org/ticket/21767">#21767</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadminincludesbookmarkphp">trunk/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunkwpadminincludesclasswplinkslisttablephp">trunk/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunkwpadminlinkaddphp">trunk/wp-admin/link-add.php</a></li>
<li><a href="#trunkwpadminlinkphp">trunk/wp-admin/link.php</a></li>
<li><a href="#trunkwpadminoptionsheadphp">trunk/wp-admin/options-head.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/admin.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -77,8 +77,6 @@
</span><span class="cx"> $date_format = get_option('date_format');
</span><span class="cx"> $time_format = get_option('time_format');
</span><span class="cx">
</span><del>-wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));
-
</del><span class="cx"> wp_enqueue_script( 'common' );
</span><span class="cx">
</span><span class="cx"> $editing = false;
</span></span></pre></div>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/edit-link-form.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -126,7 +126,6 @@
</span><span class="cx"> if ( $link_id ) : ?>
</span><span class="cx"> <input type="hidden" name="action" value="save" />
</span><span class="cx"> <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
</span><del>-<input type="hidden" name="order_by" value="<?php echo esc_attr($order_by); ?>" />
</del><span class="cx"> <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
</span><span class="cx"> <?php else: ?>
</span><span class="cx"> <input type="hidden" name="action" value="add" />
</span></span></pre></div>
<a id="trunkwpadminincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/bookmark.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/bookmark.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/includes/bookmark.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -55,12 +55,12 @@
</span><span class="cx"> function get_default_link_to_edit() {
</span><span class="cx"> $link = new stdClass;
</span><span class="cx"> if ( isset( $_GET['linkurl'] ) )
</span><del>- $link->link_url = esc_url( $_GET['linkurl'] );
</del><ins>+ $link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
</ins><span class="cx"> else
</span><span class="cx"> $link->link_url = '';
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['name'] ) )
</span><del>- $link->link_name = esc_attr( $_GET['name'] );
</del><ins>+ $link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
</ins><span class="cx"> else
</span><span class="cx"> $link->link_name = '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-links-list-table.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-links-list-table.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/includes/class-wp-links-list-table.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> function prepare_items() {
</span><span class="cx"> global $cat_id, $s, $orderby, $order;
</span><span class="cx">
</span><del>- 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' ) );
</del><ins>+ wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
</ins><span class="cx">
</span><span class="cx"> $args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminlinkaddphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-add.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-add.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/link-add.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -15,10 +15,7 @@
</span><span class="cx"> $title = __('Add New Link');
</span><span class="cx"> $parent_file = 'link-manager.php';
</span><span class="cx">
</span><del>-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[]'));
</del><ins>+wp_reset_vars( array('action', 'cat_id', 'link_id' ) );
</ins><span class="cx">
</span><span class="cx"> wp_enqueue_script('link');
</span><span class="cx"> wp_enqueue_script('xfn');
</span></span></pre></div>
<a id="trunkwpadminlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/link.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><span class="cx"> require_once ('admin.php');
</span><span class="cx">
</span><del>-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[]'));
</del><ins>+wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! current_user_can('manage_links') )
</span><span class="cx"> wp_link_manager_disabled_message();
</span></span></pre></div>
<a id="trunkwpadminoptionsheadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-head.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-head.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/options-head.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -2,14 +2,13 @@
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Options Header.
</span><span class="cx"> *
</span><del>- * Resets variables: 'action', 'standalone', and 'option_group_id'. Displays
- * updated message, if updated variable is part of the URL query.
</del><ins>+ * Displays updated message, if updated variable is part of the URL query.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><del>-wp_reset_vars(array('action', 'standalone', 'option_group_id'));
</del><ins>+wp_reset_vars( array( 'action' ) );
</ins><span class="cx">
</span><span class="cx"> if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {
</span><span class="cx"> // For backwards compat with plugins that don't use the Settings API and just set updated=1 in the redirect
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/post.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> $parent_file = 'edit.php';
</span><span class="cx"> $submenu_file = 'edit.php';
</span><span class="cx">
</span><del>-wp_reset_vars(array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder'));
</del><ins>+wp_reset_vars( array( 'action' ) );
</ins><span class="cx">
</span><span class="cx"> if ( isset( $_GET['post'] ) )
</span><span class="cx"> $post_id = $post_ID = (int) $_GET['post'];
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (23444 => 23445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2013-02-16 17:46:12 UTC (rev 23444)
+++ trunk/wp-admin/user-edit.php 2013-02-16 18:28:41 UTC (rev 23445)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><del>-wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer'));
</del><ins>+wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
</ins><span class="cx">
</span><span class="cx"> $user_id = (int) $user_id;
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>-$wp_http_referer = remove_query_arg(array('update', 'delete_count'), wp_unslash( $wp_http_referer ) );
</del><ins>+$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer );
</ins><span class="cx">
</span><span class="cx"> $user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>