Changeset 10139

Timestamp:

08/10/2020 07:54:50 AM (6 years ago)

Author:

dd32

Message:

Two Factor: PHP 7.4 compatibility.

This ensures that the class is compatible with that of which it extends.

Props xknown.
See ​https://github.com/WordPress/wordpress.org/pull/16

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/wporg-two-factor.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/wporg-two-factor.php

@@ -27 +27 @@
 
                 if ( ! is_admin() ) {
-                        add_action( 'edit_user_profile', [ $this, 'user_two_factor_options' ] );
-                        add_action( 'show_user_profile', [ $this, 'user_two_factor_options' ] );
+                        add_action( 'edit_user_profile', [ __CLASS__, 'user_two_factor_options' ] );
+                        add_action( 'show_user_profile', [ __CLASS__, 'user_two_factor_options' ] );
                 }
 
@@ -39 +39 @@
                 remove_action( 'login_form_backup_2fa',   [ 'Two_Factor_Core', 'backup_2fa' ] );
 
-                add_action( 'wp_login',                [ $this, 'wp_login' ], 10, 2 );
-                add_action( 'login_form_validate_2fa', [ $this, 'login_form_validate_2fa' ] );
-                add_action( 'login_form_backup_2fa',   [ $this, 'backup_2fa' ] );
+                add_action( 'wp_login',                [ __CLASS__, 'wp_login' ], 10, 2 );
+                add_action( 'login_form_validate_2fa', [ __CLASS__, 'login_form_validate_2fa' ] );
+                add_action( 'login_form_backup_2fa',   [ __CLASS__, 'backup_2fa' ] );
 
         }
@@ -112 +112 @@
 
                 // At this point we know they have a 2FA account, were already logged in, and had a 2FA cookie
-                $this->set_2fa_cookies( get_userdata( $user_id ), $expire );
+                self::set_2fa_cookies( get_userdata( $user_id ), $expire );
         }
 
@@ -121 +121 @@
         }
 
-        function set_2fa_cookies( $user, $expiration = false ) {
+        static function set_2fa_cookies( $user, $expiration = false ) {
                 if ( ! $expiration ) {
                         // Set the Expiration based on the main Authentication cookie
@@ -194 +194 @@
                 }
 
-                $this->set_2fa_cookies( $user );
+                self::set_2fa_cookies( $user );
 
                 // Must be global because that's how login_header() uses it.
@@ -375 +375 @@
                 if ( $result && $user_id == get_current_user_id() ) {
                         $user = wp_get_current_user();
-                        $this->set_2fa_cookies( $user );
+                        self::set_2fa_cookies( $user );
                 }