<!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>[16930] trunk/wp-admin/network/site-users.php: s/Creationism/Evolution/
in site-users.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16930">16930</a></dd>
<dt>Author</dt> <dd>PeteMall</dd>
<dt>Date</dt> <dd>2010-12-15 02:22:53 +0000 (Wed, 15 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/Creationism/Evolution/ in site-users. See <a href="http://trac.wordpress.org/ticket/14756">#14756</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (16929 => 16930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2010-12-14 19:51:13 UTC (rev 16929)
+++ trunk/wp-admin/network/site-users.php 2010-12-15 02:22:53 UTC (rev 16930)
</span><span class="lines">@@ -218,8 +218,13 @@
</span><span class="cx"> <?php do_action( 'network_site_users_after_list_table', '' );?>
</span><span class="cx">
</span><span class="cx"> <?php if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) : ?>
</span><del>-<h3 id="add-existing-user"><?php _e('Add Existing User') ?></h3>
-<p><?php _e( 'Enter the username of an existing user on this network.' ) ?></p>
</del><ins>+<h4 id="add-user"><?php _e('Add User to This Site') ?></h4>
+ <?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
+<p><?php _e( 'You may add from existing network users, or set up a new user to add to this site.' ); ?></p>
+ <?php else : ?>
+<p><?php _e( 'You may add from existing network users to this site.' ); ?></p>
+ <?php endif; ?>
+<h5 id="add-existing-user"><?php _e('Add Existing User') ?></h5>
</ins><span class="cx"> <form action="site-users.php?action=adduser" id="adduser" method="post">
</span><span class="cx"> <?php wp_nonce_field( 'edit-site' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="lines">@@ -247,9 +252,8 @@
</span><span class="cx"> </form>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
-<h3 id="add-new-user"><?php _e('Create New User') ?></h3>
-<p><?php _e( 'Create a brand new user and add it to this site.' ) ?></p>
</del><ins>+<?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
+<h5 id="add-new-user"><?php _e('Add New User') ?></h5>
</ins><span class="cx"> <form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
</span><span class="cx"> <?php wp_nonce_field( 'edit-site' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="lines">@@ -280,7 +284,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
</span><del>- <?php submit_button( __('Add User'), 'primary', 'add-user' ); ?>
</del><ins>+ <?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>