<!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>[19374] trunk: Set $parent_file for post-new.php when show_in_menu is a file.</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/19374">19374</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-11-21 15:35:57 +0000 (Mon, 21 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set $parent_file for post-new.php when show_in_menu is a file. Provides for correct top-level highlighting. $submenu_file remains set to expect a post-new.php menu. see <a href="http://core.trac.wordpress.org/ticket/19125">#19125</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminaboutphp">trunk/wp-admin/about.php</a></li>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadmincreditsphp">trunk/wp-admin/credits.php</a></li>
<li><a href="#trunkwpadminfreedomsphp">trunk/wp-admin/freedoms.php</a></li>
<li><a href="#trunkwpadminpostnewphp">trunk/wp-admin/post-new.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenimagephp">trunk/wp-content/themes/twentyeleven/image.php</a></li>
<li><a href="#trunkwpincludespluginphp">trunk/wp-includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminaboutphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/about.php (19373 => 19374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/about.php 2011-11-21 14:53:42 UTC (rev 19373)
+++ trunk/wp-admin/about.php 2011-11-21 15:35:57 UTC (rev 19374)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> $title = __( 'About' );
</span><ins>+$parent_file = 'about.php';
</ins><span class="cx">
</span><span class="cx"> list( $display_version ) = explode( '-', $wp_version );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (19373 => 19374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2011-11-21 14:53:42 UTC (rev 19373)
+++ trunk/wp-admin/admin-header.php 2011-11-21 15:35:57 UTC (rev 19374)
</span><span class="lines">@@ -114,10 +114,11 @@
</span><span class="cx"> do_action('network_admin_notices');
</span><span class="cx"> elseif ( is_user_admin() )
</span><span class="cx"> do_action('user_admin_notices');
</span><del>-else
</del><ins>+elseif ( 'about' != $current_screen->parent_base )
</ins><span class="cx"> do_action('admin_notices');
</span><span class="cx">
</span><del>-do_action('all_admin_notices');
</del><ins>+if ( 'about' != $current_screen->parent_base )
+ do_action('all_admin_notices');
</ins><span class="cx">
</span><span class="cx"> if ( $parent_file == 'options-general.php' )
</span><span class="cx"> require(ABSPATH . 'wp-admin/options-head.php');
</span></span></pre></div>
<a id="trunkwpadmincreditsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/credits.php (19373 => 19374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/credits.php 2011-11-21 14:53:42 UTC (rev 19373)
+++ trunk/wp-admin/credits.php 2011-11-21 15:35:57 UTC (rev 19374)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> $title = __( 'Credits' );
</span><ins>+$parent_file = 'about.php';
</ins><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('Each name or handle is a link to that person&#8217;s profile in the WordPress.org community directory.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminfreedomsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/freedoms.php (19373 => 19374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/freedoms.php 2011-11-21 14:53:42 UTC (rev 19373)
+++ trunk/wp-admin/freedoms.php 2011-11-21 15:35:57 UTC (rev 19374)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> $title = __( 'Freedoms' );
</span><ins>+$parent_file = 'about.php';
</ins><span class="cx">
</span><span class="cx"> list( $display_version ) = explode( '-', $wp_version );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpostnewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post-new.php (19373 => 19374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post-new.php 2011-11-21 14:53:42 UTC (rev 19373)
+++ trunk/wp-admin/post-new.php 2011-11-21 15:35:57 UTC (rev 19374)
</span><span class="lines">@@ -16,16 +16,19 @@
</span><span class="cx"> else
</span><span class="cx"> wp_die( __('Invalid post type') );
</span><span class="cx">
</span><del>-if ( 'post' != $post_type ) {
- $parent_file = "edit.php?post_type=$post_type";
- $submenu_file = "post-new.php?post_type=$post_type";
-} else {
</del><ins>+$post_type_object = get_post_type_object( $post_type );
+
+if ( 'post' == $post_type ) {
</ins><span class="cx"> $parent_file = 'edit.php';
</span><span class="cx"> $submenu_file = 'post-new.php';
</span><ins>+} else {
+ if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+ $parent_file = $post_type_object->show_in_menu;
+ else
+ $parent_file = "edit.php?post_type=$post_type";
+ $submenu_file = "post-new.php?post_type=$post_type";
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-$post_type_object = get_post_type_object($post_type);
-
</del><span class="cx"> $title = $post_type_object->labels->add_new_item;
</span><span class="cx">
</span><span class="cx"> $editing = true;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/image.php (19373 => 19374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/image.php 2011-11-21 14:53:42 UTC (rev 19373)
+++ trunk/wp-content/themes/twentyeleven/image.php 2011-11-21 15:35:57 UTC (rev 19374)
</span><span class="lines">@@ -34,8 +34,9 @@
</span><span class="cx"> $metadata['width'],
</span><span class="cx"> $metadata['height'],
</span><span class="cx"> esc_url( get_permalink( $post->post_parent ) ),
</span><del>- get_the_title( $post->post_parent )
</del><ins>+ $blah = get_the_title( $post->post_parent )
</ins><span class="cx"> );
</span><ins>+ var_dump( $blah );
</ins><span class="cx"> ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span></span></pre></div>
<a id="trunkwpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/plugin.php (19373 => 19374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php 2011-11-21 14:53:42 UTC (rev 19373)
+++ trunk/wp-includes/plugin.php 2011-11-21 15:35:57 UTC (rev 19374)
</span><span class="lines">@@ -283,9 +283,9 @@
</span><span class="cx">
</span><span class="cx"> if( isset($wp_filter[$tag]) ) {
</span><span class="cx"> if( false !== $priority && isset($wp_filter[$tag][$priority]) )
</span><del>- unset($wp_filter[$tag][$priority]);
</del><ins>+ $wp_filter[$tag][$priority] = array();
</ins><span class="cx"> else
</span><del>- unset($wp_filter[$tag]);
</del><ins>+ $wp_filter[$tag] = array();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if( isset($merged_filters[$tag]) )
</span></span></pre>
</div>
</div>
</body>
</html>