<!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>[12916] trunk/wp-admin: Revert [12908].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12916">12916</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-01 08:12:56 +0000 (Mon, 01 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/12908">[12908]</a>. Update Users cap to use a capability. See <a href="http://trac.wordpress.org/ticket/12098">#12098</a>. Props nacin</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.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 (12915 => 12916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-01-31 21:32:39 UTC (rev 12915)
+++ trunk/wp-admin/menu.php 2010-02-01 08:12:56 UTC (rev 12916)
</span><span class="lines">@@ -128,10 +128,8 @@
</span><span class="cx"> if ( current_user_can('edit_users') ) {
</span><span class="cx"> $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
</span><span class="cx"> $submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
</span><ins>+ $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
</ins><span class="cx">
</span><del>- if ( ! is_multisite() || get_site_option( 'add_new_users' ) )
- $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
-
</del><span class="cx"> $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
</span><span class="cx"> } else {
</span><span class="cx"> $_wp_real_parent_file['users.php'] = 'profile.php';
</span><span class="lines">@@ -363,4 +361,4 @@
</span><span class="cx"> wp_die( __('You do not have sufficient permissions to access this page.') );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (12915 => 12916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-01-31 21:32:39 UTC (rev 12915)
+++ trunk/wp-admin/users.php 2010-02-01 08:12:56 UTC (rev 12916)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php echo esc_html( $title ); if ( !is_multisite() || get_site_option( 'add_new_users' ) ) { ?> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a><?php }
</del><ins>+<h2><?php echo esc_html( $title ); if ( current_user_can( 'create_users' ) ) { ?> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a><?php }
</ins><span class="cx"> if ( isset($_GET['usersearch']) && $_GET['usersearch'] )
</span><span class="cx"> printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $_GET['usersearch'] ) ); ?>
</span><span class="cx"> </h2>
</span></span></pre>
</div>
</div>
</body>
</html>