Changeset 49765

Timestamp:

12/07/2020 07:59:15 PM (4 years ago)

Author:

helen

Message:

App Passwords: Store the "in use" option in the main network options.

Whether App Passwords are being used is a global featurel, not a per-network feature. This fixes issues on Multi Network installs if App Passwords are used on a different network from where they were created.

Props spacedmonkey.
Fixes #51939.
See [49752].
Merges [49764] to the 5.6 branch.

Location:

branches/5.6

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/upgrade.php (modified) (1 diff)
• src/wp-includes/class-wp-application-passwords.php (modified) (2 diffs)

branches/5.6/src/wp-admin/includes/upgrade.php

@@ -2289 +2289 @@
 
         if ( ! empty( $results ) ) {
-            update_site_option( WP_Application_Passwords::OPTION_KEY_IN_USE, 1 );
+            $network_id = get_main_network_id();
+            update_network_option( $network_id, WP_Application_Passwords::OPTION_KEY_IN_USE, 1 );
         }
     }

branches/5.6/src/wp-includes/class-wp-application-passwords.php

@@ -51 +51 @@
      */
     public static function is_in_use() {
-        return (bool) get_site_option( self::OPTION_KEY_IN_USE );
+        $network_id = get_main_network_id();
+        return (bool) get_network_option( $network_id, self::OPTION_KEY_IN_USE );
     }
 
@@ -90 +91 @@
         }
 
-        if ( ! get_site_option( self::OPTION_KEY_IN_USE ) ) {
-            update_site_option( self::OPTION_KEY_IN_USE, true );
+        $network_id = get_main_network_id();
+        if ( ! get_network_option( $network_id, self::OPTION_KEY_IN_USE ) ) {
+            update_network_option( $network_id, self::OPTION_KEY_IN_USE, true );
         }