<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17668] trunk/wp-admin:
Allow plugins to control user and network admin canonical redirects.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17668">17668</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-20 20:19:50 +0000 (Wed, 20 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow plugins to control user and network admin canonical redirects. fixes <a href="http://trac.wordpress.org/ticket/17196">#17196</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkadminphp">trunk/wp-admin/network/admin.php</a></li>
<li><a href="#trunkwpadminuseradminphp">trunk/wp-admin/user/admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/admin.php (17667 => 17668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/admin.php 2011-04-20 18:02:41 UTC (rev 17667)
+++ trunk/wp-admin/network/admin.php 2011-04-20 20:19:50 UTC (rev 17668)
</span><span class="lines">@@ -15,8 +15,11 @@
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><del>-if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
</del><ins>+$redirect_network_admin_request = ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) );
+$redirect_network_admin_request = apply_filters( 'redirect_network_admin_request', $redirect_network_admin_request );
+if ( $redirect_network_admin_request ) {
</ins><span class="cx"> wp_redirect( network_admin_url() );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><ins>+unset( $redirect_network_admin_request );
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminuseradminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user/admin.php (17667 => 17668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/admin.php 2011-04-20 18:02:41 UTC (rev 17667)
+++ trunk/wp-admin/user/admin.php 2011-04-20 20:19:50 UTC (rev 17668)
</span><span class="lines">@@ -16,8 +16,12 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
</del><ins>+$redirect_user_admin_request = ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) );
+$redirect_user_admin_request = apply_filters( 'redirect_user_admin_request', $redirect_user_admin_request );
+if ( $redirect_user_admin_request ) {
</ins><span class="cx"> wp_redirect( user_admin_url() );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><ins>+unset( $redirect_user_admin_request );
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>