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

Timestamp:

02/27/2018 02:59:18 AM (7 years ago)

Author:

dd32

Message:

2FA: enable_two_factor() and disable_two_factor() shouldn't be static.

See #77.

File:

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

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

@@ -353 +353 @@
      * NOTE: It's assumed that the Two Factor details have been setup correctly previously.
      */
-    public static function enable_two_factor( $user_id ) {
+    public function enable_two_factor( $user_id ) {
         $result = (
             update_user_meta( $user_id, self::PROVIDER_USER_META_KEY,          'WPORG_Two_Factor_Primary' ) &&
@@ -370 +370 @@
      * Simple handler to disable Two factor for a given user.
      */
-    public static function disable_two_factor( $user_id ) {
+    public function disable_two_factor( $user_id ) {
         delete_user_meta( $user_id, self::PROVIDER_USER_META_KEY );
         delete_user_meta( $user_id, self::ENABLED_PROVIDERS_USER_META_KEY );
@@ -565 +565 @@
             }
 
-            if ( ! self::enable_two_factor( $user_id ) ) {
+            if ( ! $this->enable_two_factor( $user_id ) ) {
                 wp_send_json_error( __( 'Unable to save Two Factor Authentication code. Please try again.', 'wporg' ) );
             }
@@ -586 +586 @@
         }
 
-        if ( ! self::disable_two_factor( $user_id ) ) {
+        if ( ! $this->disable_two_factor( $user_id ) ) {
             wp_send_json_error( __( 'Unable to remove Two Factor Authentication code. Please try again.', 'wporg' ) );
         }