Add back-compat to old WP versions for new v2.2 features

assets/src/components/themes-context-provider/index.js

@@ -62,7 +62,7 @@ export function ThemesContextProvider( {
 
 			try {
 				const fetchedThemes = await apiFetch( {
-					path: '/wp/v2/themes',
+					path: '/wp/v2/themes?status=active',
 				} );
 
 				if ( hasUnmounted.current === true ) {

includes/validation/class-amp-validation-manager.php

@@ -666,7 +666,16 @@ public static function add_validation_error_sourcing() {
 
 		add_filter( 'do_shortcode_tag', [ __CLASS__, 'decorate_shortcode_source' ], PHP_INT_MAX, 2 );
 		add_filter( 'embed_oembed_html', [ __CLASS__, 'decorate_embed_source' ], PHP_INT_MAX, 3 );
-		add_filter( 'the_content', [ __CLASS__, 'add_block_source_comments' ], 8 ); // The do_blocks() function runs at priority 9.
+
+		// The `WP_Block_Type_Registry` class was added in WordPress 5.0.0. Because of that it sometimes caused issues
+		// on the AMP Validated URL screen when on WordPress 4.9.
+		if ( class_exists( 'WP_Block_Type_Registry' ) ) {
+			add_filter( 'the_content', [
+				__CLASS__,
+				'add_block_source_comments'
+			], 8 ); // The do_blocks() function runs at priority 9.
+		}
+
 		add_filter( 'the_editor', [ __CLASS__, 'filter_the_editor_to_detect_sources' ] );
 	}
 

src/Admin/AmpPlugins.php

@@ -11,6 +11,7 @@
 use AmpProject\AmpWP\Infrastructure\Delayed;
 use AmpProject\AmpWP\Infrastructure\Registerable;
 use AmpProject\AmpWP\Infrastructure\Service;
+use AmpProject\AmpWP\Services;
 use WP_Screen;
 use function get_current_screen;
 use stdClass;
@@ -61,6 +62,10 @@ public static function get_registration_action() {
 	 */
 	public static function is_needed() {
 
+		if ( ! Services::get( 'dependency_support' )->has_support() ) {
+			return false;
+		}
+
 		/** This filter is documented in src/Admin/AmpThemes.php */
 		return is_admin() && apply_filters( 'amp_compatible_ecosystem_shown', true, 'plugins' );
 	}

src/Admin/AmpThemes.php

@@ -11,6 +11,7 @@
 use AmpProject\AmpWP\Infrastructure\Delayed;
 use AmpProject\AmpWP\Infrastructure\Registerable;
 use AmpProject\AmpWP\Infrastructure\Service;
+use AmpProject\AmpWP\Services;
 use WP_Screen;
 use stdClass;
 
@@ -60,6 +61,10 @@ public static function get_registration_action() {
 	 */
 	public static function is_needed() {
 
+		if ( ! Services::get( 'dependency_support' )->has_support() ) {
+			return false;
+		}
+
 		/**
 		 * Filters whether to show AMP compatible ecosystem in the admin.
 		 *

src/Admin/OnboardingWizardSubmenuPage.php

@@ -303,7 +303,7 @@ protected function add_preload_rest_paths() {
 			),
 			'/wp/v2/plugins',
 			'/wp/v2/settings',
-			'/wp/v2/themes',
+			'/wp/v2/themes?status=active',
 			'/wp/v2/users/me',
 		];
 

src/Admin/OptionsMenu.php

@@ -322,7 +322,7 @@ protected function add_preload_rest_paths() {
 			),
 			'/wp/v2/plugins',
 			'/wp/v2/settings',
-			'/wp/v2/themes',
+			'/wp/v2/themes?status=active',
 			'/wp/v2/users/me',
 		];
 

src/Admin/PluginActivationSiteScan.php

@@ -13,11 +13,11 @@
 
 use AMP_Options_Manager;
 use AMP_Validation_Manager;
-use AmpProject\AmpWP\DevTools\UserAccess;
 use AmpProject\AmpWP\Infrastructure\Conditional;
 use AmpProject\AmpWP\Infrastructure\Delayed;
 use AmpProject\AmpWP\Infrastructure\Registerable;
 use AmpProject\AmpWP\Infrastructure\Service;
+use AmpProject\AmpWP\Services;
 
 /**
  * Class PluginActivationSiteScan
@@ -67,6 +67,8 @@ public static function is_needed() {
 		return (
 			is_admin()
 			&&
+			Services::get( 'dependency_support' )->has_support()
+			&&
 			! is_network_admin()
 			&&
 			'plugins.php' === $pagenow

src/Admin/SupportScreen.php

@@ -106,6 +106,7 @@ public static function is_needed() {
 		return (
 			is_admin()
 			&&
+			// Note: The view_site_health_checks capability was introduced in WordPress 5.2, so this will return false in older versions.
 			self::has_cap()
 		);
 	}