<!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>[19027] trunk: Use wp_lostpassword_url() instead of site_url(wp-login...).</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19027">19027</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-10-20 14:40:11 +0000 (Thu, 20 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use wp_lostpassword_url() instead of site_url(wp-login...). Update wp_lostpassword_url() to use network_site_url(). props markoheijnen, fixes <a href="http://core.trac.wordpress.org/ticket/18808">#18808</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (19026 => 19027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2011-10-20 14:33:18 UTC (rev 19026)
+++ trunk/wp-activate.php 2011-10-20 14:40:11 UTC (rev 19027)
</span><span class="lines">@@ -63,9 +63,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> echo '<p class="lead-in">';
</span><span class="cx"> if ( $signup->domain . $signup->path == '' ) {
</span><del>- printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) );
</del><ins>+ printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() );
</ins><span class="cx"> } else {
</span><del>- printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) );
</del><ins>+ printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() );
</ins><span class="cx"> }
</span><span class="cx"> echo '</p>';
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (19026 => 19027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2011-10-20 14:33:18 UTC (rev 19026)
+++ trunk/wp-includes/general-template.php 2011-10-20 14:40:11 UTC (rev 19027)
</span><span class="lines">@@ -288,14 +288,14 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $redirect Path to redirect to on login.
</span><span class="cx"> */
</span><del>-function wp_lostpassword_url($redirect = '') {
</del><ins>+function wp_lostpassword_url( $redirect = '' ) {
</ins><span class="cx"> $args = array( 'action' => 'lostpassword' );
</span><span class="cx"> if ( !empty($redirect) ) {
</span><span class="cx"> $args['redirect_to'] = $redirect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $lostpassword_url = add_query_arg($args, site_url('wp-login.php', 'login'));
- return apply_filters('lostpassword_url', $lostpassword_url, $redirect);
</del><ins>+ $lostpassword_url = add_query_arg( $args, network_site_url('wp-login.php', 'login') );
+ return apply_filters( 'lostpassword_url', $lostpassword_url, $redirect );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (19026 => 19027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2011-10-20 14:33:18 UTC (rev 19026)
+++ trunk/wp-includes/user.php 2011-10-20 14:40:11 UTC (rev 19027)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> $userdata = get_user_by('login', $username);
</span><span class="cx">
</span><span class="cx"> if ( !$userdata )
</span><del>- return new WP_Error('invalid_username', sprintf(__('<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
</del><ins>+ return new WP_Error('invalid_username', sprintf(__('<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), wp_lostpassword_url()));
</ins><span class="cx">
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> // Is user marked as spam?
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !wp_check_password($password, $userdata->user_pass, $userdata->ID) )
</span><span class="cx"> return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s" title="Password Lost and Found">Lost your password</a>?' ),
</span><del>- $username, site_url( 'wp-login.php?action=lostpassword', 'login' ) ) );
</del><ins>+ $username, wp_lostpassword_url() ) );
</ins><span class="cx">
</span><span class="cx"> $user = new WP_User($userdata->ID);
</span><span class="cx"> return $user;
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (19026 => 19027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2011-10-20 14:33:18 UTC (rev 19026)
+++ trunk/wp-login.php 2011-10-20 14:40:11 UTC (rev 19027)
</span><span class="lines">@@ -530,7 +530,7 @@
</span><span class="cx">
</span><span class="cx"> <p id="nav">
</span><span class="cx"> <a href="<?php echo site_url('wp-login.php', 'login') ?>"><?php _e('Log in') ?></a> |
</span><del>-<a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
</del><ins>+<a href="<?php echo wp_lostpassword_url() ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -659,9 +659,9 @@
</span><span class="cx"> <?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
</span><span class="cx"> <?php elseif ( get_option('users_can_register') ) : ?>
</span><span class="cx"> <a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a> |
</span><del>-<a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
</del><ins>+<a href="<?php echo wp_lostpassword_url() ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
</ins><span class="cx"> <?php else : ?>
</span><del>-<a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
</del><ins>+<a href="<?php echo wp_lostpassword_url() ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php } ?>
</span></span></pre>
</div>
</div>
</body>
</html>