Changeset 10931

Timestamp:

04/14/2009 06:31:49 PM (16 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-content/themes/classic/comments.php (modified) (1 diff)
• wp-content/themes/default/comments.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-content/themes/classic/comments.php

@@ -43 +43 @@
 
 <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), get_option('siteurl')."/wp-login.php?redirect_to=".urlencode(get_permalink()));?></p>
+<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() ) );?></p>
 <?php else : ?>
 

trunk/wp-content/themes/default/comments.php

@@ -58 +58 @@
 
 <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
+<p>You must be <a href="<?php echo wp_login_url( get_permalink() ); ?>">logged in</a> to post a comment.</p>
 <?php else : ?>
 

trunk/wp-includes/comment-template.php

@@ -985 +985 @@
 
     if ( get_option('comment_registration') && !$user_ID )
-        $link = '<a rel="nofollow" href="' . site_url('wp-login.php?redirect_to=' . get_permalink()) . '">' . $login_text . '</a>';
+        $link = '<a rel="nofollow" href="' . wp_login_url( get_permalink() ) . '">' . $login_text . '</a>';
     else
         $link = "<a rel='nofollow' class='comment-reply-link' href='" . wp_specialchars( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
@@ -1036 +1036 @@
 
     if ( get_option('comment_registration') && !$user_ID ) {
-        $link = '<a rel="nofollow" href="' . site_url('wp-login.php?redirect_to=' . get_permalink()) . '">' . $login_text . '</a>';
+        $link = '<a rel="nofollow" href="' . wp_login_url( get_permalink() ) . '">' . $login_text . '</a>';
     } else {
         $link = "<a rel='nofollow' class='comment-reply-link' href='" . get_permalink($post->ID) . "#$respond_id' onclick='return addComment.moveForm(\"$add_below-$post->ID\", \"0\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";

trunk/wp-includes/functions.php

@@ -2318 +2318 @@
         $html .= "</p><p><a href='" . remove_query_arg( 'updated', clean_url( wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
     elseif ( 'log-out' == $action )
-        $html .= "</p><p>" . sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_nonce_url( site_url('wp-login.php?action=logout', 'login'), 'log-out' ) );
+        $html .= "</p><p>" . sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url() );
 
     wp_die( $html, $title);

trunk/wp-includes/general-template.php

@@ -155 +155 @@
  * @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";
-
-    return wp_nonce_url( site_url("wp-login.php?action=logout$redirect", 'login'), 'log-out' );
+    $args = array( 'action' => 'logout' );
+    if ( !empty($redirect) ) {
+        $args['redirect_to'] = $redirect;
+    }
+
+    $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);
 }
 
@@ -172 +178 @@
  * @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";
-
-    return site_url("wp-login.php$redirect", 'login');
+    $login_url = site_url('wp-login.php', 'login');
+
+    if ( !empty($redirect) ) {
+        $login_url = add_query_arg('redirect_to', $redirect, $login_url);
+    }
+
+    return apply_filters('login_url', $login_url, $redirect);
 }
 

trunk/wp-includes/pluggable.php

@@ -751 +751 @@
     $redirect = ( strpos($_SERVER['REQUEST_URI'], '/options.php') && wp_get_referer() ) ? wp_get_referer() : $proto . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 
-    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( $redirect ), 'login' );
+    $login_url = wp_login_url($redirect);
 
     wp_redirect($login_url);
@@ -1103 +1103 @@
     $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
     $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
-    $message .= site_url("wp-login.php", 'login') . "\r\n";
+    $message .= wp_login_url() . "\r\n";
 
     wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message);