<!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>[19579] trunk/wp-admin: Best practice, use wp_safe_redirect() when dealing with referrers.</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/19579">19579</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-12-10 18:26:48 +0000 (Sat, 10 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Best practice, use wp_safe_redirect() when dealing with referrers. Props nacin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (19578 => 19579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2011-12-09 19:20:47 UTC (rev 19578)
+++ trunk/wp-admin/edit-comments.php 2011-12-10 18:26:48 UTC (rev 19579)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> } elseif ( isset( $_REQUEST['ids'] ) ) {
</span><span class="cx"> $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
</span><span class="cx"> } elseif ( wp_get_referer() ) {
</span><del>- wp_redirect( wp_get_referer() );
</del><ins>+ wp_safe_redirect( wp_get_referer() );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if ( $trashed || $spammed )
</span><span class="cx"> $redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
</span><span class="cx">
</span><del>- wp_redirect( $redirect_to );
</del><ins>+ wp_safe_redirect( $redirect_to );
</ins><span class="cx"> exit;
</span><span class="cx"> } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
</span><span class="cx"> wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (19578 => 19579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2011-12-09 19:20:47 UTC (rev 19578)
+++ trunk/wp-admin/includes/misc.php 2011-12-10 18:26:48 UTC (rev 19579)
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> update_user_meta($user->ID, $option, $value);
</span><del>- wp_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (19578 => 19579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2011-12-09 19:20:47 UTC (rev 19578)
+++ trunk/wp-admin/network/site-themes.php 2011-12-10 18:26:48 UTC (rev 19579)
</span><span class="lines">@@ -118,12 +118,12 @@
</span><span class="cx"> update_option( 'allowedthemes', $allowed_themes );
</span><span class="cx"> restore_current_blog();
</span><span class="cx">
</span><del>- wp_redirect( add_query_arg( array( 'id' => $id, $action => $n ), $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'id' => $id, $action => $n ), $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
</span><del>- wp_redirect( $referer );
</del><ins>+ wp_safe_redirect( $referer );
</ins><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (19578 => 19579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2011-12-09 19:20:47 UTC (rev 19578)
+++ trunk/wp-admin/network/site-users.php 2011-12-10 18:26:48 UTC (rev 19579)
</span><span class="lines">@@ -153,12 +153,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> restore_current_blog();
</span><del>- wp_redirect( add_query_arg( 'update', $update, $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
</ins><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
</span><del>- wp_redirect( $referer );
</del><ins>+ wp_safe_redirect( $referer );
</ins><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (19578 => 19579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2011-12-09 19:20:47 UTC (rev 19578)
+++ trunk/wp-admin/network/sites.php 2011-12-10 18:26:48 UTC (rev 19579)
</span><span class="lines">@@ -63,9 +63,9 @@
</span><span class="cx">
</span><span class="cx"> if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
</span><span class="cx"> wpmu_delete_blog( $id, true );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'delete' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'delete' ), wp_get_referer() ) );
</ins><span class="cx"> } else {
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'not_deleted' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'not_deleted' ), wp_get_referer() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> exit();
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $blogfunction ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $blogfunction ), wp_get_referer() ) );
</ins><span class="cx"> } else {
</span><span class="cx"> wp_redirect( network_admin_url( 'sites.php' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> update_blog_status( $id, 'archived', '1' );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'archive' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'archive' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> update_blog_status( $id, 'archived', '0' );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unarchive' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unarchive' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> update_blog_status( $id, 'deleted', '0' );
</span><span class="cx"> do_action( 'activate_blog', $id );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'activate' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'activate' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'deactivate_blog', $id );
</span><span class="cx"> update_blog_status( $id, 'deleted', '1' );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'deactivate' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'deactivate' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> update_blog_status( $id, 'spam', '0' );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unspam' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unspam' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> update_blog_status( $id, 'spam', '1' );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'spam' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'spam' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> update_blog_status( $id, 'mature', '0' );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unmature' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unmature' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> update_blog_status( $id, 'mature', '1' );
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'mature' ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'mature' ), wp_get_referer() ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (19578 => 19579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2011-12-09 19:20:47 UTC (rev 19578)
+++ trunk/wp-admin/network/themes.php 2011-12-10 18:26:48 UTC (rev 19579)
</span><span class="lines">@@ -47,33 +47,33 @@
</span><span class="cx"> check_admin_referer('disable-theme_' . $_GET['theme']);
</span><span class="cx"> unset( $allowed_themes[ $_GET['theme'] ] );
</span><span class="cx"> update_site_option( 'allowedthemes', $allowed_themes );
</span><del>- wp_redirect( add_query_arg( 'disabled', '1', $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'enable-selected':
</span><span class="cx"> check_admin_referer('bulk-themes');
</span><span class="cx"> $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</span><span class="cx"> if ( empty($themes) ) {
</span><del>- wp_redirect( add_query_arg( 'error', 'none', $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> foreach( (array) $themes as $theme )
</span><span class="cx"> $allowed_themes[ $theme ] = true;
</span><span class="cx"> update_site_option( 'allowedthemes', $allowed_themes );
</span><del>- wp_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'disable-selected':
</span><span class="cx"> check_admin_referer('bulk-themes');
</span><span class="cx"> $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</span><span class="cx"> if ( empty($themes) ) {
</span><del>- wp_redirect( add_query_arg( 'error', 'none', $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> foreach( (array) $themes as $theme )
</span><span class="cx"> unset( $allowed_themes[ $theme ] );
</span><span class="cx"> update_site_option( 'allowedthemes', $allowed_themes );
</span><del>- wp_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'update-selected' :
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> unset( $themes[ get_option( 'stylesheet' ) ] );
</span><span class="cx">
</span><span class="cx"> if ( empty( $themes ) ) {
</span><del>- wp_redirect( add_query_arg( 'error', 'none', $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $themes ) ) {
</span><del>- wp_redirect( add_query_arg( 'error', 'main', $referer ) );
</del><ins>+ wp_safe_redirect( add_query_arg( 'error', 'main', $referer ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (19578 => 19579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2011-12-09 19:20:47 UTC (rev 19578)
+++ trunk/wp-admin/network/users.php 2011-12-10 18:26:48 UTC (rev 19579)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
</del><ins>+ wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
</ins><span class="cx"> } else {
</span><span class="cx"> $location = network_admin_url( 'users.php' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>