
<!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>[15781] trunk/wp-login.php: Revert part of [15780] included by accident.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15781">15781</a></dd>

<dt>Author</dt> <dd>scribu</dd>

<dt>Date</dt> <dd>2010-10-12 20:32:41 +0000 (Tue, 12 Oct 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>Revert part of <a href="http://trac.wordpress.org/changeset/15780">[15780]</a> included by accident. See <a href="http://trac.wordpress.org/ticket/5919">#5919</a></pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwploginphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-login.php (15780 => 15781)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-login.php        2010-10-12 20:29:19 UTC (rev 15780)

+++ trunk/wp-login.php        2010-10-12 20:32:41 UTC (rev 15781)

</span><span class="lines">@@ -334,28 +334,6 @@

</span><span class="cx">         return $user_id;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-// TODO: Eliminate duplicated code from wp_default_scripts()

-function load_password_strength_meter() {

-        if ( !$guessurl = site_url() )

-                $guessurl = wp_guess_url();

-

-        $suffix = defined('SCRIPT_DEBUG') &amp;&amp; SCRIPT_DEBUG ? '.dev' : '';

-

-        wp_enqueue_script( 'password-strength-meter', $guessurl . &quot;/wp-admin/js/password-strength-meter$suffix.js&quot;, array('jquery'), '20100331' );

-        wp_localize_script( 'password-strength-meter', 'pwsL10n', array(

-                'empty' =&gt; __('Strength indicator'),

-                'short' =&gt; __('Very weak'),

-                'bad' =&gt; __('Weak'),

-                /* translators: password strength */

-                'good' =&gt; _x('Medium', 'password strength'),

-                'strong' =&gt; __('Strong'),

-                'mismatch' =&gt; __('Mismatch'),

-                'l10n_print_after' =&gt; 'try{convertEntities(pwsL10n);}catch(e){};'

-        ) );

-

-        wp_print_scripts( array('password-strength-meter') );

-}

-

</del><span class="cx"> //

</span><span class="cx"> // Main

</span><span class="cx"> //

</span><span class="lines">@@ -469,8 +447,6 @@

</span><span class="cx"> 

</span><span class="cx">         login_header(__('Reset Password'), '&lt;p class=&quot;message reset-pass&quot;&gt;' . __('Reset your password') . '&lt;/p&gt;', $errors );

</span><span class="cx"> 

</span><del>-        load_password_strength_meter();

-

</del><span class="cx"> ?&gt;

</span><span class="cx"> &lt;form name=&quot;resetpassform&quot; id=&quot;resetpassform&quot; action=&quot;&lt;?php echo site_url('wp-login.php?action=resetpass&amp;key=' . urlencode($_GET['key']) . '&amp;login=' . urlencode($_GET['login']), 'login_post') ?&gt;&quot; method=&quot;post&quot;&gt;

</span><span class="cx">         &lt;p&gt;

</span><span class="lines">@@ -482,9 +458,6 @@

</span><span class="cx">                 &lt;input type=&quot;password&quot; name=&quot;pass2&quot; id=&quot;user_pass&quot; class=&quot;input&quot; size=&quot;20&quot; value=&quot;&quot; autocomplete=&quot;off&quot; /&gt;&lt;/label&gt;

</span><span class="cx">         &lt;/p&gt;

</span><span class="cx"> 

</span><del>-        &lt;div id=&quot;pass-strength-result&quot;&gt;&lt;?php _e('Strength indicator'); ?&gt;&lt;/div&gt;

-        &lt;p class=&quot;description indicator-hint&quot;&gt;&lt;?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! &quot; ? $ % ^ &amp;amp; ).'); ?&gt;&lt;/p&gt;

-

</del><span class="cx">         &lt;br class=&quot;clear&quot; /&gt;

</span><span class="cx">         &lt;p class=&quot;submit&quot;&gt;&lt;input type=&quot;submit&quot; name=&quot;wp-submit&quot; id=&quot;wp-submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e('Reset Password'); ?&gt;&quot; tabindex=&quot;100&quot; /&gt;&lt;/p&gt;

</span><span class="cx"> &lt;/form&gt;

</span></span></pre>

</div>

</div>


</body>

</html>