Changeset 10982

Timestamp:

08/02/2016 05:44:09 AM (9 years ago)

Author:

r-a-y

Message:

Core: Adjust how our error message is registered on the WP login page.

WordPress 3.6 introduced the 'wp_login_errors' filter, which allows us to
properly register our no access error message on the WordPress login page
in a better manner.

This also addresses an issue with the Theme My Login plugin where a PHP
warning was being displayed.

Fixes #4990.

File:

• trunk/src/bp-core/bp-core-catchuri.php (modified) (2 diffs)

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

@@ -699 +699 @@
 
 /**
- * Add an error message to wp-login.php.
- *
- * Hooks into the "bpnoaccess" action defined in bp_core_no_access().
+ * Add a custom BuddyPress no access error message to wp-login.php.
  *
  * @since 1.5.0
- *
- * @global string $error Error message to pass to wp-login.php.
- */
-function bp_core_no_access_wp_login_error() {
-    global $error;
+ * @since 2.7.0 Hook moved to 'wp_login_errors' made available since WP 3.6.0.
+ *
+ * @param  WP_Error $errors Current error container.
+ * @return WP_Error
+ */
+function bp_core_no_access_wp_login_error( $errors ) {
+    if ( empty( $_GET['action'] ) || 'bpnoaccess' !== $_GET['action'] ) {
+        return $errors;
+    }
 
     /**
@@ -718 +720 @@
      * @param string $value URL to redirect user to after successful login.
      */
-    $error = apply_filters( 'bp_wp_login_error', __( 'You must log in to access the page you requested.', 'buddypress' ), $_REQUEST['redirect_to'] );
-
-    // Shake shake shake!.
-    add_action( 'login_head', 'wp_shake_js', 12 );
-}
-add_action( 'login_form_bpnoaccess', 'bp_core_no_access_wp_login_error' );
+    $message = apply_filters( 'bp_wp_login_error', __( 'You must log in to access the page you requested.', 'buddypress' ), $_REQUEST['redirect_to'] );
+
+    $errors->add( 'bp_no_access', $message );
+
+    return $errors;
+}
+add_filter( 'wp_login_errors', 'bp_core_no_access_wp_login_error' );
+
+/**
+ * Add our custom error code to WP login's shake error codes.
+ *
+ * @since 2.7.0
+ *
+ * @param  array $codes Array of WP error codes.
+ * @return array
+ */
+function bp_core_login_filter_shake_codes( $codes ) {
+    $codes[] = 'bp_no_access';
+    return $codes;
+}
+add_filter( 'shake_error_codes', 'bp_core_login_filter_shake_codes' );
 
 /**