<!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>[14126] trunk/wp-admin/includes/plugin.php: Check $pagenow?post_type=
 $typenow for submenu titles,
  Fixes page titles for plugin pages added to custom post_type's.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14126">14126</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-18 02:56:00 +0000 (Sun, 18 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Check $pagenow?post_type=$typenow for submenu titles, Fixes page titles for plugin pages added to custom post_type's. Fixes <a href="http://trac.wordpress.org/ticket/12985">#12985</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (14125 => 14126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php        2010-04-18 01:54:44 UTC (rev 14125)
+++ trunk/wp-admin/includes/plugin.php        2010-04-18 02:56:00 UTC (rev 14126)
</span><span class="lines">@@ -1242,6 +1242,7 @@
</span><span class="cx">         global $submenu;
</span><span class="cx">         global $pagenow;
</span><span class="cx">         global $plugin_page;
</span><ins>+        global $typenow;
</ins><span class="cx"> 
</span><span class="cx">         if ( ! empty ( $title ) )
</span><span class="cx">                 return $title;
</span><span class="lines">@@ -1267,11 +1268,17 @@
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">         } else {
</span><del>-                foreach (array_keys( $submenu ) as $parent) {
</del><ins>+                foreach ( array_keys( $submenu ) as $parent ) {
</ins><span class="cx">                         foreach ( $submenu[$parent] as $submenu_array ) {
</span><span class="cx">                                 if ( isset( $plugin_page ) &amp;&amp;
</span><del>-                                        ($plugin_page == $submenu_array[2] ) &amp;&amp;
-                                        (($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) &amp;&amp; ($parent1 != $submenu_array[2] ) ) )
</del><ins>+                                        ( $plugin_page == $submenu_array[2] ) &amp;&amp;
+                                        (
+                                                ( $parent == $pagenow ) ||
+                                                ( $parent == $plugin_page ) ||
+                                                ( $plugin_page == $hook ) ||
+                                                ( $pagenow == 'admin.php' &amp;&amp; $parent1 != $submenu_array[2] ) ||
+                                                ( !empty($typenow) &amp;&amp; $parent == $pagenow . '?post_type=' . $typenow)
+                                        )
</ins><span class="cx">                                         ) {
</span><span class="cx">                                                 $title = $submenu_array[3];
</span><span class="cx">                                                 return $submenu_array[3];
</span><span class="lines">@@ -1292,9 +1299,9 @@
</span><span class="cx">                 if ( empty ( $title ) ) {
</span><span class="cx">                         foreach ( $menu as $menu_array ) {
</span><span class="cx">                                 if ( isset( $plugin_page ) &amp;&amp;
</span><del>-                                        ($plugin_page == $menu_array[2] ) &amp;&amp;
-                                        ($pagenow == 'admin.php' ) &amp;&amp;
-                                        ($parent1 == $menu_array[2] ) )
</del><ins>+                                        ( $plugin_page == $menu_array[2] ) &amp;&amp;
+                                        ( $pagenow == 'admin.php' ) &amp;&amp;
+                                        ( $parent1 == $menu_array[2] ) )
</ins><span class="cx">                                         {
</span><span class="cx">                                                 $title = $menu_array[3];
</span><span class="cx">                                                 return $menu_array[3];
</span><span class="lines">@@ -1330,10 +1337,9 @@
</span><span class="cx">                 $page_type = $admin_page_hooks[$parent];
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-
</del><span class="cx">         $plugin_name = preg_replace( '!\.php!', '', $plugin_page );
</span><span class="cx"> 
</span><del>-        return $page_type.'_page_'.$plugin_name;
</del><ins>+        return $page_type . '_page_' . $plugin_name;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function user_can_access_admin_page() {
</span></span></pre>
</div>
</div>

</body>
</html>