<!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" />
<title>[33246] trunk/src: Passwords: New UI for install screen.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33246">33246</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33246","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-13 22:21:39 +0000 (Mon, 13 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Passwords: New UI for install screen.
Also synchronises the use of `pw_weak` as an input name and removes trailing
periods from checkbox labels.
Props MikeHansenMe, adamsilverstein, obenland.
See <a href="https://core.trac.wordpress.org/ticket/32589">#32589</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssinstallcss">trunk/src/wp-admin/css/install.css</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssinstallcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/install.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/install.css 2015-07-13 22:14:45 UTC (rev 33245)
+++ trunk/src/wp-admin/css/install.css 2015-07-13 22:21:39 UTC (rev 33246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .form-table td {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 9px;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 20px 10px 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-bottom: 8px solid #fff;
</del><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: top
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .form-table.install-success td {
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: middle;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 16px 20px 10px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 16px 20px 16px 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .form-table.install-success td p {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,38 +197,66 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-family: Consolas, Monaco, monospace;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-hide-pw > .dashicons {
+ line-height: inherit;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #pass-strength-result {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #eee;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-color: #ddd !important;
- border-style: solid;
- border-width: 1px;
- margin: 5px 5px 5px 0;
- padding: 5px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border: 1px solid #ddd;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ opacity: 0;
+ padding: 3px 5px;
</ins><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 200px;
- display: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 218px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#pass-strength-result.short {
+ background-color: #ffa0a0;
+ border-color: #f04040;
+ opacity: 1;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #pass-strength-result.bad {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #ffb78c;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-color: #ff853c !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border-color: #ff853c;
+ opacity: 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #pass-strength-result.good {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #ffec8b;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-color: #ffcc00 !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border-color: #fc0;
+ opacity: 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#pass-strength-result.short {
- background-color: #ffa0a0;
- border-color: #f04040 !important;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #pass-strength-result.strong {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #c3ff88;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-color: #8dff1c !important;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border-color: #8dff1c;
+ opacity: 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+[name="admin_password"].short {
+ border-color: #f04040;
+}
+
+[name="admin_password"].bad {
+ border-color: #ff853c;
+}
+
+[name="admin_password"].good {
+ border-color: #fc0;
+}
+
+[name="admin_password"].strong {
+ border-color: #8dff1c;
+}
+
+.pw-weak {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .message {
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #c00;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0.5em 0.7em;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,6 +401,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: top;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.button-secondary.hide-if-no-js,
+.hide-if-no-js {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * HiDPI Displays
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2015-07-13 22:14:45 UTC (rev 33245)
+++ trunk/src/wp-admin/install.php 2015-07-13 22:21:39 UTC (rev 33246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx" style="display: block; padding: 0 10px"> <title><?php _e( 'WordPress › Installation' ); ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_admin_css( 'install', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_css( 'install', true );
+ wp_admin_css( 'dashicons', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body class="wp-core-ui<?php echo $body_classes ?>">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,18 +129,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! $user_table ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tr>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class="form-field form-required user-pass1-wrap">
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="pass1"><?php _e('Password, twice'); ?></label>
- <p><?php _e('A password will be automatically generated for you if you leave this blank.'); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="pass1">
+ <?php _e( 'Password' ); ?>
+ <span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="admin_password" type="password" id="pass1" size="25" value="" />
- <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
- <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
- <p><?php echo wp_get_password_hint(); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
+ <div class="wp-pwd hide-if-js">
+ <?php $initial_password = wp_generate_password( 24 ); ?>
+ <input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" />
+ <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0">
+ <span class="dashicons dashicons-visibility"></span>
+ <span class="text">hide</span>
+ </button>
+ <div id="pass-strength-result"></div>
+ </div>
+ <p><span class="description hide-if-no-js"><?php _e( 'A password reset link will be sent to you via email.' ); ?></span></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class="form-field form-required user-pass2-wrap hide-if-js">
+ <th scope="row">
+ <label for="pass2"><?php _e( 'Repeat Password' ); ?>
+ <span class="description"><?php _e( '(required)' ); ?></span>
+ </label>
+ </th>
+ <td>
+ <input name="admin_password2" type="password" id="pass2" autocomplete="off" />
+ </td>
+ </tr>
+ <tr class="pw-weak">
+ <th scope="row"><?php _e( 'Confirm Password' ); ?></th>
+ <td>
+ <label>
+ <input type="checkbox" name="pw_weak" class="pw-checkbox" />
+ <?php _e( 'Confirm use of weak password' ); ?>
+ </label>
+ </td>
+ </tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,10 +177,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Privacy' ); ?></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td colspan="2"><label><input type="checkbox" name="blog_public" id="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow search engines to index this site.' ); ?></label></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td colspan="2"><label><input type="checkbox" name="blog_public" id="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow search engines to index this site' ); ?></label></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button button-large" /></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="step"><?php submit_button( __( 'Install WordPress' ), 'large', 'Submit', false, array( 'id' => 'submit' ) ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,5 +352,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_print_scripts( 'user-profile' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_print_scripts( 'language-chooser' ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<script type="text/javascript">
+jQuery( function( $ ) {
+ $( '.hide-if-no-js' ).removeClass( 'hide-if-no-js' );
+} );
+</script>
</ins><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2015-07-13 22:14:45 UTC (rev 33245)
+++ trunk/src/wp-admin/user-edit.php 2015-07-13 22:21:39 UTC (rev 33246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,8 +483,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="pw-weak">
</span><span class="cx" style="display: block; padding: 0 10px"> <th><?php _e( 'Confirm Password' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="pw-weak">
- <input type="checkbox" name="pw-weak" class="pw-checkbox" id="pw-weak" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="pw_weak">
+ <input type="checkbox" name="pw_weak" class="pw-checkbox" id="pw-weak" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Confirm use of weak password' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2015-07-13 22:14:45 UTC (rev 33245)
+++ trunk/src/wp-admin/user-new.php 2015-07-13 22:21:39 UTC (rev 33246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="pass1">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Password' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="description hide-if-js"><?php /* translators: password input field */_e( '(required)' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,7 +413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required user-pass2-wrap hide-if-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="pass2" type="password" id="pass2" autocomplete="off" />
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +423,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="pw-weak">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="pw-weak" class="pw-checkbox" id="pw-weak" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Confirm use of weak password.' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Confirm use of weak password' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2015-07-13 22:14:45 UTC (rev 33245)
+++ trunk/src/wp-includes/pluggable.php 2015-07-13 22:21:39 UTC (rev 33246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2107,8 +2107,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rnd_value .= sha1($rnd_value);
</span><span class="cx" style="display: block; padding: 0 10px"> $rnd_value .= sha1($rnd_value . $seed);
</span><span class="cx" style="display: block; padding: 0 10px"> $seed = md5($seed . $rnd_value);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_SETUP_CONFIG' ) )
- set_transient('random_seed', $seed);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! defined( 'WP_SETUP_CONFIG' ) && ! defined( 'WP_INSTALLING' ) ) {
+ set_transient( 'random_seed', $seed );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Take the first 8 digits for our value
</span></span></pre>
</div>
</div>
</body>
</html>