Changeset 6761 for sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-slack.php

Timestamp:

02/26/2018 12:26:40 PM (7 years ago)

Author:

dd32

Message:

2FA: Have WPORG_Two_Factor_Email be it's own provider in it's own right.

By extending WPORG_Two_Factor_Email for WPORG_Two_Factor_Slack it was found that Two_Factor_Email uses self:: a bunch causing the usermeta token override not to take effect.

See #77.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-slack.php (modified) (1 diff)

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

@@ -5 +5 @@
 class WPORG_Two_Factor_Slack extends WPORG_Two_Factor_Email {
 
-    /**
-     * The user meta token key.
-     *
-     * @type string
-     */
     const TOKEN_META_KEY = '_two_factor_slack_token';
 
-    /**
-     * Ensures only one instance of this class exists in memory at any one time.
-     *
-     * @since 0.1-dev
-     */
-    static function get_instance() {
+    public static function get_instance() {
         static $instance;
-        $class = __CLASS__;
-        if ( ! is_a( $instance, $class ) ) {
+        if ( ! $instance ) {
+            $class = __CLASS__;
             $instance = new $class;
         }