Ticket #17398: 17398.diff

wp-includes/functions.php

@@ -2735 +2735 @@
 function wp_nonce_ays( $action ) {
         $title = __( 'WordPress Failure Notice' );
         $html = esc_html( wp_explain_nonce( $action ) );
-        if ( 'log-out' == $action )
-                $html .= "</p><p>" . sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url() );
-        elseif ( wp_get_referer() )
+        if ( 'log-out' == $action ) {
+                $logout_url = wp_logout_url();
+                if ( !empty( $_REQUEST['redirect_to'] ) )
+                        $logout_url = add_query_arg( array('redirect_to' => $_REQUEST['redirect_to']), $logout_url );
+                $html .= "</p><p>" . sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), $logout_url );
+        } elseif ( wp_get_referer() ) {
                 $html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+        }
 
         wp_die( $html, $title, array('response' => 403) );
 }