<!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>[14049] trunk/wp-admin/menu.php: Prevent $post_type_object->
menu_position from conflicting with another plugin, or core menu item.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14049">14049</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-10 10:48:30 +0000 (Sat, 10 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent $post_type_object->menu_position from conflicting with another plugin, or core menu item. Props blepoxp. Fixes <a href="http://trac.wordpress.org/ticket/12951">#12951</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (14048 => 14049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-04-10 10:47:31 UTC (rev 14048)
+++ trunk/wp-admin/menu.php 2010-04-10 10:48:30 UTC (rev 14049)
</span><span class="lines">@@ -114,11 +114,15 @@
</span><span class="cx"> $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
</span><span class="cx">
</span><span class="cx"> foreach ( (array) get_post_types( array('show_ui' => true) ) as $ptype ) {
</span><del>- $_wp_last_object_menu++;
</del><span class="cx"> $ptype_obj = get_post_type_object($ptype);
</span><del>- $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : $_wp_last_object_menu;
</del><ins>+ $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
</ins><span class="cx"> $menu_icon = is_string($ptype_obj->menu_icon) ? esc_url($ptype_obj->menu_icon) : 'div';
</span><del>-
</del><ins>+
+ // if $ptype_menu_position is already populated or will be populated by a hard-coded value below, increment the position.
+ $core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
+ while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
+ $ptype_menu_position++;
+
</ins><span class="cx"> $menu[$ptype_menu_position] = array(esc_attr($ptype_obj->label), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-posts', 'menu-' . sanitize_html_class($ptype), $menu_icon);
</span><span class="cx"> $submenu["edit.php?post_type=$ptype"][5] = array( __('Edit'), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype");
</span><span class="cx"> /* translators: add new custom post type */
</span><span class="lines">@@ -411,7 +415,7 @@
</span><span class="cx">
</span><span class="cx"> $menu = add_menu_classes($menu);
</span><span class="cx">
</span><del>-if (! user_can_access_admin_page()) {
</del><ins>+if ( !user_can_access_admin_page() ) {
</ins><span class="cx"> do_action('admin_page_access_denied');
</span><span class="cx"> wp_die( __('You do not have sufficient permissions to access this page.') );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>