IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates to wp_login_url() and wp_logout_url(). Use them in more places. Props wnorris. fixes #9536

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2009-04-14 18:31:49 +00:00
parent ff657986ff
commit fe648c9e20
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/general-template.php
View File

@@ -154,14 +154,20 @@ function wp_loginout() {
* @since 2.7
* @uses wp_nonce_url() To protect against CSRF
* @uses site_url() To generate the log in URL
* @uses apply_filters() calls 'logout_url' hook on final logout url
*
* @param string $redirect Path to redirect to on logout.
*/
function wp_logout_url($redirect = '') {
if ( strlen($redirect) )
$redirect = "&redirect_to=$redirect";
$args = array( 'action' => 'logout' );
if ( !empty($redirect) ) {
$args['redirect_to'] = $redirect;
}
return wp_nonce_url( site_url("wp-login.php?action=logout$redirect", 'login'), 'log-out' );
$logout_url = add_query_arg($args, site_url('wp-login.php', 'login'));
$logout_url = wp_nonce_url( $logout_url, 'log-out' );
return apply_filters('logout_url', $logout_url, $redirect);
}
/**
@@ -171,14 +177,18 @@ function wp_logout_url($redirect = '') {
*
* @since 2.7
* @uses site_url() To generate the log in URL
* @uses apply_filters() calls 'login_url' hook on final login url
*
* @param string $redirect Path to redirect to on login.
*/
function wp_login_url($redirect = '') {
if ( strlen($redirect) )
$redirect = "?redirect_to=$redirect";
$login_url = site_url('wp-login.php', 'login');
return site_url("wp-login.php$redirect", 'login');
if ( !empty($redirect) ) {
$login_url = add_query_arg('redirect_to', $redirect, $login_url);
}
return apply_filters('login_url', $login_url, $redirect);
}
/**