<!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>[19321] trunk/wp-admin: Don't fallback to default post type or taxonomy if given an invalid post type or taxonomy.</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/19321">19321</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-11-17 18:01:08 +0000 (Thu, 17 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't fallback to default post type or taxonomy if given an invalid post type or taxonomy. Use typenow as the canonical post type. Props nacin. see <a href="http://core.trac.wordpress.org/ticket/19131">#19131</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (19320 => 19321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2011-11-17 16:55:44 UTC (rev 19320)
+++ trunk/wp-admin/edit.php 2011-11-17 18:01:08 UTC (rev 19321)
</span><span class="lines">@@ -9,20 +9,18 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-if ( !isset($_GET['post_type']) )
- $post_type = 'post';
-elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) )
- $post_type = $_GET['post_type'];
-else
- wp_die( __('Invalid post type') );
</del><ins>+if ( ! $typenow )
+ wp_die( __( 'Invalid post type' ) );
</ins><span class="cx">
</span><del>-$_GET['post_type'] = $post_type;
-
</del><ins>+$post_type = $typenow;
</ins><span class="cx"> $post_type_object = get_post_type_object( $post_type );
</span><span class="cx">
</span><del>-if ( !current_user_can($post_type_object->cap->edit_posts) )
- wp_die(__('Cheatin&#8217; uh?'));
</del><ins>+if ( ! $post_type_object )
+ wp_die( __( 'Invalid post type' ) );
</ins><span class="cx">
</span><ins>+if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
+ wp_die( __( 'Cheatin&#8217; uh?' ) );
+
</ins><span class="cx"> $wp_list_table = _get_list_table('WP_Posts_List_Table');
</span><span class="cx"> $pagenum = $wp_list_table->get_pagenum();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (19320 => 19321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2011-11-17 16:55:44 UTC (rev 19320)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2011-11-17 18:01:08 UTC (rev 19321)
</span><span class="lines">@@ -48,14 +48,7 @@
</span><span class="cx"> function __construct() {
</span><span class="cx"> global $post_type_object, $wpdb;
</span><span class="cx">
</span><del>- if ( !isset( $_REQUEST['post_type'] ) )
- $post_type = 'post';
- elseif ( in_array( $_REQUEST['post_type'], get_post_types( array( 'show_ui' => true ) ) ) )
- $post_type = $_REQUEST['post_type'];
- else
- wp_die( __( 'Invalid post type' ) );
- $_REQUEST['post_type'] = $post_type;
-
</del><ins>+ $post_type = get_current_screen()->post_type;
</ins><span class="cx"> $post_type_object = get_post_type_object( $post_type );
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $post_type_object->cap->edit_others_posts ) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (19320 => 19321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-11-17 16:55:44 UTC (rev 19320)
+++ trunk/wp-admin/includes/screen.php 2011-11-17 18:01:08 UTC (rev 19321)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> if ( is_a( $hook_name, 'WP_Screen' ) )
</span><span class="cx"> return $hook_name;
</span><span class="cx">
</span><del>- $action = $post_type = $taxonomy = '';
</del><ins>+ $action = $post_type = $taxonomy = null;
</ins><span class="cx"> $is_network = $is_user = false;
</span><span class="cx">
</span><span class="cx"> if ( $hook_name )
</span><span class="lines">@@ -447,10 +447,10 @@
</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><del>- 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'];
</del><ins>+ if ( isset( $_REQUEST['post_type'] ) )
+ $post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
+ if ( isset( $_REQUEST['taxonomy'] ) )
+ $taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
</ins><span class="cx">
</span><span class="cx"> switch ( $base ) {
</span><span class="cx"> case 'post' :
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 'edit-tags' :
</span><del>- if ( ! $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
</del><ins>+ if ( null === $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">@@ -476,17 +476,17 @@
</span><span class="cx">
</span><span class="cx"> switch ( $base ) {
</span><span class="cx"> case 'post' :
</span><del>- if ( ! $post_type )
</del><ins>+ if ( null === $post_type )
</ins><span class="cx"> $post_type = 'post';
</span><span class="cx"> $id = $post_type;
</span><span class="cx"> break;
</span><span class="cx"> case 'edit' :
</span><del>- if ( ! $post_type )
</del><ins>+ if ( null === $post_type )
</ins><span class="cx"> $post_type = 'post';
</span><span class="cx"> $id .= '-' . $post_type;
</span><span class="cx"> break;
</span><span class="cx"> case 'edit-tags' :
</span><del>- if ( ! $taxonomy )
</del><ins>+ if ( null === $taxonomy )
</ins><span class="cx"> $taxonomy = 'post_tag';
</span><span class="cx"> $id = 'edit-' . $taxonomy;
</span><span class="cx"> break;
</span><span class="lines">@@ -511,8 +511,8 @@
</span><span class="cx">
</span><span class="cx"> $screen->base = $base;
</span><span class="cx"> $screen->action = $action;
</span><del>- $screen->post_type = $post_type;
- $screen->taxonomy = $taxonomy;
</del><ins>+ $screen->post_type = (string) $post_type;
+ $screen->taxonomy = (string) $taxonomy;
</ins><span class="cx"> $screen->is_user = $is_user;
</span><span class="cx"> $screen->is_network = $is_network;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (19320 => 19321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2011-11-17 16:55:44 UTC (rev 19320)
+++ trunk/wp-admin/includes/template.php 2011-11-17 18:01:08 UTC (rev 19321)
</span><span class="lines">@@ -1392,7 +1392,7 @@
</span><span class="cx"> },
</span><span class="cx"> ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
</span><span class="cx"> pagenow = '<?php echo $current_screen->id; ?>',
</span><del>- typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
</del><ins>+ typenow = '<?php echo $current_screen->post_type; ?>',
</ins><span class="cx"> adminpage = '<?php echo $admin_body_class; ?>',
</span><span class="cx"> thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
</span><span class="cx"> decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
</span></span></pre>
</div>
</div>
</body>
</html>