<!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>[19132] trunk/wp-admin: Allow is_network and is_user to work for all screen instances.</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/19132">19132</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-11-03 23:00:46 +0000 (Thu, 03 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow is_network and is_user to work for all screen instances. see <a href="http://core.trac.wordpress.org/ticket/18785">#18785</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (19131 => 19132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2011-11-03 20:26:09 UTC (rev 19131)
+++ trunk/wp-admin/admin-ajax.php 2011-11-03 23:00:46 UTC (rev 19132)
</span><span class="lines">@@ -55,10 +55,7 @@
</span><span class="cx"> $list_class = $_GET['list_args']['class'];
</span><span class="cx"> check_ajax_referer( "fetch-list-$list_class", '_ajax_fetch_list_nonce' );
</span><span class="cx">
</span><del>- $current_screen = (object) $_GET['list_args']['screen'];
- //TODO fix this in a better way see #15336
- $current_screen->is_network = 'false' === $current_screen->is_network ? false : true;
- $current_screen->is_user = 'false' === $current_screen->is_user ? false : true;
</del><ins>+ $current_screen = convert_to_screen( $_GET['list_args']['screen']['id'] );
</ins><span class="cx">
</span><span class="cx"> define( 'WP_NETWORK_ADMIN', $current_screen->is_network );
</span><span class="cx"> define( 'WP_USER_ADMIN', $current_screen->is_user );
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (19131 => 19132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-11-03 20:26:09 UTC (rev 19131)
+++ trunk/wp-admin/includes/screen.php 2011-11-03 23:00:46 UTC (rev 19132)
</span><span class="lines">@@ -400,6 +400,7 @@
</span><span class="cx"> return $hook_name;
</span><span class="cx">
</span><span class="cx"> $action = $post_type = $taxonomy = '';
</span><ins>+ $is_network = $is_user = false;
</ins><span class="cx">
</span><span class="cx"> if ( $hook_name )
</span><span class="cx"> $id = $hook_name;
</span><span class="lines">@@ -412,10 +413,13 @@
</span><span class="cx"> $id = str_replace( array( '-new', '-add' ), '', $id );
</span><span class="cx">
</span><span class="cx"> if ( $hook_name ) {
</span><del>- if ( '-network' == substr( $id, -8 ) )
</del><ins>+ if ( '-network' == substr( $id, -8 ) ) {
</ins><span class="cx"> $id = str_replace( '-network', '', $id );
</span><del>- elseif ( '-user' == substr( $id, -5 ) )
</del><ins>+ $is_network = true;
+ } elseif ( '-user' == substr( $id, -5 ) ) {
</ins><span class="cx"> $id = str_replace( '-user', '', $id );
</span><ins>+ $is_user = true;
+ }
</ins><span class="cx">
</span><span class="cx"> $id = sanitize_key( $id );
</span><span class="cx"> if ( post_type_exists( $id ) ) {
</span><span class="lines">@@ -431,6 +435,9 @@
</span><span class="cx"> $post_type = $second;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ } else {
+ $is_network = is_network_admin();
+ $is_user = is_user_admin();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'index' == $id )
</span><span class="lines">@@ -485,10 +492,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( is_network_admin() ) {
</del><ins>+ if ( $is_network ) {
</ins><span class="cx"> $id .= '-network';
</span><span class="cx"> $base .= '-network';
</span><del>- } elseif ( is_user_admin() ) {
</del><ins>+ } elseif ( $is_user ) {
</ins><span class="cx"> $id .= '-user';
</span><span class="cx"> $base .= '-user';
</span><span class="cx"> }
</span><span class="lines">@@ -506,8 +513,8 @@
</span><span class="cx"> $screen->action = $action;
</span><span class="cx"> $screen->post_type = $post_type;
</span><span class="cx"> $screen->taxonomy = $taxonomy;
</span><del>- $screen->is_user = is_user_admin();
- $screen->is_network = is_network_admin();
</del><ins>+ $screen->is_user = $is_user;
+ $screen->is_network = $is_network;
</ins><span class="cx">
</span><span class="cx"> self::$_registry[ $id ] = $screen;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>