Changeset 11698

Timestamp:

09/17/2017 07:18:10 PM (7 years ago)

Author:

djpaul

Message:

Core: use wp_login_url() instead of site_url().

Props slaFFik

Fixes #7522

Location:

trunk/src

Files:

• bp-activity/bp-activity-screens.php (modified) (1 diff)
• bp-core/bp-core-filters.php (modified) (2 diffs)
• bp-core/bp-core-functions.php (modified) (3 diffs)
• bp-core/classes/class-bp-core-login-widget.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-screens.php

@@ -282 +282 @@
         } else {
             $url = sprintf(
-                site_url( 'wp-login.php?redirect_to=%s' ),
-                urlencode( esc_url_raw( bp_activity_get_permalink( bp_current_action() ) ) )
+                wp_login_url( 'wp-login.php?redirect_to=%s' ),
+                esc_url_raw( bp_activity_get_permalink( bp_current_action() ) )
             );
         }

trunk/src/bp-core/bp-core-filters.php

@@ -1009 +1009 @@
 
     // Add 'List-Unsubscribe' header if applicable.
-    if ( ! empty( $tokens['unsubscribe'] ) && $tokens['unsubscribe'] !== site_url( 'wp-login.php' ) ) {
+    if ( ! empty( $tokens['unsubscribe'] ) && $tokens['unsubscribe'] !== wp_login_url() ) {
         $user = get_user_by( 'email', $tokens['recipient.email'] );
 
@@ -1078 +1078 @@
     // Set default unsubscribe link if not passed.
     if ( empty( $tokens['unsubscribe'] ) ) {
-        $tokens['unsubscribe'] = site_url( 'wp-login.php' );
+        $tokens['unsubscribe'] = wp_login_url();
     }
 

trunk/src/bp-core/bp-core-functions.php

@@ -3679 +3679 @@
     // Check required values.
     if ( ! $raw_user_id || ! $raw_email_type || ! $raw_hash || ! array_key_exists( $raw_email_type, $emails ) ) {
-        $redirect_to = site_url( 'wp-login.php' );
+        $redirect_to = wp_login_url();
         $result_msg  = __( 'Something has gone wrong.', 'buddypress' );
         $unsub_msg   = __( 'Please log in and go to your settings to unsubscribe from notification emails.', 'buddypress' );
@@ -3685 +3685 @@
     // Check valid hash.
     } elseif ( ! hash_equals( $new_hash, $raw_hash ) ) {
-        $redirect_to = site_url( 'wp-login.php' );
+        $redirect_to = wp_login_url();
         $result_msg  = __( 'Something has gone wrong.', 'buddypress' );
         $unsub_msg   = __( 'Please log in and go to your settings to unsubscribe from notification emails.', 'buddypress' );
@@ -3755 +3755 @@
 
     if ( empty( $args['notification_type'] ) || ! array_key_exists( $args['notification_type'], $emails ) ) {
-        return site_url( 'wp-login.php' );
+        return wp_login_url();
     }
 

trunk/src/bp-core/classes/class-bp-core-login-widget.php

@@ -105 +105 @@
             do_action( 'bp_before_login_widget_loggedout' ); ?>
 
-            <form name="bp-login-form" id="bp-login-widget-form" class="standard-form" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
+            <form name="bp-login-form" id="bp-login-widget-form" class="standard-form" action="<?php echo esc_url( wp_login_url() ); ?>" method="post">
                 <label for="bp-login-widget-user-login"><?php _e( 'Username', 'buddypress' ); ?></label>
                 <input type="text" name="log" id="bp-login-widget-user-login" class="input" value="" />