<!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>[19097] trunk/wp-admin: Consistently set taxnow/typenow and the current screen's post_type/taxnomy, whenever it can be detected.</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/19097">19097</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-10-31 21:28:17 +0000 (Mon, 31 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consistently set taxnow/typenow and the current screen's post_type/taxnomy, whenever it can be detected. Allow WP_Screen::get() to accept a post type as a hook_name. Fixes issues with the meta box $page/$screen argument. fixes <a href="http://core.trac.wordpress.org/ticket/19080">#19080</a>. see <a href="http://core.trac.wordpress.org/ticket/18785">#18785</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.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="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (19096 => 19097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2011-10-31 20:22:35 UTC (rev 19096)
+++ trunk/wp-admin/admin.php 2011-10-31 21:28:17 UTC (rev 19097)
</span><span class="lines">@@ -88,13 +88,13 @@
</span><span class="cx"> $plugin_page = plugin_basename($plugin_page);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( isset($_GET['post_type']) )
- $typenow = sanitize_key($_GET['post_type']);
</del><ins>+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+ $typenow = $_REQUEST['post_type'];
</ins><span class="cx"> else
</span><span class="cx"> $typenow = '';
</span><span class="cx">
</span><del>-if ( isset($_GET['taxonomy']) )
- $taxnow = sanitize_key($_GET['taxonomy']);
</del><ins>+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+ $taxnow = $_REQUEST['taxonomy'];
</ins><span class="cx"> else
</span><span class="cx"> $taxnow = '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (19096 => 19097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-10-31 20:22:35 UTC (rev 19096)
+++ trunk/wp-admin/includes/screen.php 2011-10-31 21:28:17 UTC (rev 19097)
</span><span class="lines">@@ -418,7 +418,10 @@
</span><span class="cx"> $id = str_replace( '-user', '', $id );
</span><span class="cx">
</span><span class="cx"> $id = sanitize_key( $id );
</span><del>- if ( false !== strpos( $id, '-' ) ) {
</del><ins>+ if ( post_type_exists( $id ) ) {
+ $post_type = $id;
+ $id = 'post'; // changes later. ends up being $base.
+ } elseif ( false !== strpos( $id, '-' ) ) {
</ins><span class="cx"> list( $id, $second ) = explode( '-', $id, 2 );
</span><span class="cx"> if ( taxonomy_exists( $second ) ) {
</span><span class="cx"> $id = 'edit-tags';
</span><span class="lines">@@ -438,6 +441,11 @@
</span><span class="cx">
</span><span class="cx"> // If this is the current screen, see if we can be more accurate for post types and taxonomies.
</span><span class="cx"> if ( ! $hook_name ) {
</span><ins>+ if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+ $post_type = $_REQUEST['post_type'];
+ if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+ $taxonomy = $_REQUEST['taxonomy'];
+
</ins><span class="cx"> switch ( $base ) {
</span><span class="cx"> case 'post' :
</span><span class="cx"> if ( isset( $_GET['post'] ) )
</span><span class="lines">@@ -451,22 +459,10 @@
</span><span class="cx"> $post = get_post( $post_id );
</span><span class="cx"> if ( $post )
</span><span class="cx"> $post_type = $post->post_type;
</span><del>- } elseif ( isset( $_POST['post_type'] ) && post_type_exists( $_POST['post_type'] ) ) {
- $post_type = $_POST['post_type'];
- } elseif ( $action == 'add' && isset( $_GET['post_type'] ) && post_type_exists( $_GET['post_type'] ) ) {
- $post_type = $_GET['post_type'];
</del><span class="cx"> }
</span><span class="cx"> break;
</span><del>- case 'edit' :
- if ( isset( $_GET['post_type'] ) && post_type_exists( $_GET['post_type'] ) )
- $post_type = $_GET['post_type'];
- break;
</del><span class="cx"> case 'edit-tags' :
</span><del>- if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
- $taxonomy = $_REQUEST['taxonomy'];
- if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
- $post_type = $_REQUEST['post_type'];
- else if ( is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
</del><ins>+ if ( ! $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
</ins><span class="cx"> $post_type = 'post';
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -498,11 +494,15 @@
</span><span class="cx"> $base .= '-user';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset( self::$_registry[ $id ] ) )
- return self::$_registry[ $id ];
</del><ins>+ if ( isset( self::$_registry[ $id ] ) ) {
+ $screen = self::$_registry[ $id ];
+ if ( $screen === get_current_screen() )
+ return $screen;
+ } else {
+ $screen = new WP_Screen();
+ $screen->id = $id;
+ }
</ins><span class="cx">
</span><del>- $screen = new WP_Screen();
- $screen->id = $id;
</del><span class="cx"> $screen->base = $base;
</span><span class="cx"> $screen->action = $action;
</span><span class="cx"> $screen->post_type = $post_type;
</span></span></pre>
</div>
</div>
</body>
</html>