Merge pull request #676 from 10up/fix/661

Fix: Application Passwords handling for WordPress 5.6
10up · Dec 9, 2020 · 1d5dd57 · 1d5dd57
2 parents e114541 + 91ea59a
commit 1d5dd57
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/distributor.php b/distributor.php
@@ -113,7 +113,10 @@ function( $response ) {
 add_action(
 	'plugins_loaded',
 	function() {
-		if ( ! class_exists( 'Application_Passwords' ) ) {
+		if (
+			! class_exists( 'Application_Passwords' ) && ! class_exists( 'WP_Application_Passwords' )
+			|| class_exists( 'WP_Application_Passwords' ) && function_exists( 'wp_is_application_passwords_available' ) && ! wp_is_application_passwords_available()
+		) {
 			require_once __DIR__ . '/vendor/georgestephanis/application-passwords/application-passwords.php';
 		}
 	}