Merge branch 'trunk' into fix/check-classic-theme

plugins/auto-sizes/includes/improve-calculate-sizes.php

@@ -234,7 +234,7 @@ function auto_sizes_calculate_better_sizes( int $id, $size, string $align, int $
  * @return string The alignment width based.
  */
 function auto_sizes_get_layout_width( string $alignment ): string {
-	$layout = auto_sizes_get_layout_settings();
+	$layout = wp_get_global_settings( array( 'layout' ) );
 
 	$layout_widths = array(
 		'full'    => '100vw', // Todo: incorporate useRootPaddingAwareAlignments.
@@ -300,14 +300,3 @@ function auto_sizes_filter_render_block_context( array $context, array $block ):
 
 	return $context;
 }
-
-/**
- * Retrieves the layout settings defined in theme.json.
- *
- * @since n.e.x.t
- *
- * @return array<string, mixed> Associative array of layout settings.
- */
-function auto_sizes_get_layout_settings(): array {
-	return wp_get_global_settings( array( 'layout' ) );
-}

plugins/performance-lab/includes/admin/plugins.php

@@ -292,6 +292,31 @@ static function ( string $error_message ): string {
 		<div class="clear"></div>
 	</div>
 	<?php
+	if ( current_user_can( 'activate_plugins' ) ) {
+		?>
+		<p>
+			<?php
+			$plugins_url = add_query_arg(
+				array(
+					's'             => 'WordPress Performance Team',
+					'plugin_status' => 'all',
+				),
+				admin_url( 'plugins.php' )
+			);
+			echo wp_kses(
+				sprintf(
+					/* translators: %s is the URL to the plugins screen */
+					__( 'Performance features are installed as plugins. To update features or remove them, <a href="%s">manage them on the plugins screen</a>.', 'performance-lab' ),
+					esc_url( $plugins_url )
+				),
+				array(
+					'a' => array( 'href' => true ),
+				)
+			);
+			?>
+		</p>
+		<?php
+	}
 }
 
 /**