<!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>[12893] branches/2.8/wp-admin: Menu hardening for the 2.8 branch see #11922</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12893">12893</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-01-28 22:07:51 +0000 (Thu, 28 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Menu hardening for the 2.8 branch see <a href="http://trac.wordpress.org/ticket/11922">#11922</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches28wpadminincludespluginphp">branches/2.8/wp-admin/includes/plugin.php</a></li>
<li><a href="#branches28wpadminmenuphp">branches/2.8/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches28wpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: branches/2.8/wp-admin/includes/plugin.php (12892 => 12893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.8/wp-admin/includes/plugin.php 2010-01-28 21:52:24 UTC (rev 12892)
+++ branches/2.8/wp-admin/includes/plugin.php 2010-01-28 22:07:51 UTC (rev 12893)
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> $admin_page_hooks[$file] = sanitize_title( $menu_title );
</span><span class="cx">
</span><span class="cx"> $hookname = get_plugin_page_hookname( $file, '' );
</span><del>- if (!empty ( $function ) && !empty ( $hookname ))
</del><ins>+ if (!empty ( $function ) && !empty ( $hookname ) && current_user_can( $access_level ) )
</ins><span class="cx"> add_action( $hookname, $function );
</span><span class="cx">
</span><span class="cx"> if ( empty($icon_url) )
</span></span></pre></div>
<a id="branches28wpadminmenuphp"></a>
<div class="modfile"><h4>Modified: branches/2.8/wp-admin/menu.php (12892 => 12893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.8/wp-admin/menu.php 2010-01-28 21:52:24 UTC (rev 12892)
+++ branches/2.8/wp-admin/menu.php 2010-01-28 22:07:51 UTC (rev 12893)
</span><span class="lines">@@ -198,11 +198,13 @@
</span><span class="cx"> // Remove menus that have no accessible submenus and require privs that the user does not have.
</span><span class="cx"> // Run re-parent loop again.
</span><span class="cx"> foreach ( $menu as $id => $data ) {
</span><ins>+ if ( ! current_user_can($data[1]) )
+ $_wp_menu_nopriv[$data[2]] = true;
+
</ins><span class="cx"> // If submenu is empty...
</span><span class="cx"> if ( empty($submenu[$data[2]]) ) {
</span><span class="cx"> // And user doesn't have privs, remove menu.
</span><del>- if ( ! current_user_can($data[1]) ) {
- $_wp_menu_nopriv[$data[2]] = true;
</del><ins>+ if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
</ins><span class="cx"> unset($menu[$id]);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>