From fa6bd3a2cf6aad7432c94b0f72cabbddc563a675 Mon Sep 17 00:00:00 2001
From: Felix Arntz <felixarntz@google.com>
Date: Wed, 28 Jun 2023 11:04:40 -0700
Subject: [PATCH 1/2] Check for fetchpriority being available in WP core before
 loading it.

---
 modules/images/fetchpriority/can-load.php | 11 +++++++++++
 modules/images/fetchpriority/hooks.php    | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 modules/images/fetchpriority/can-load.php

diff --git a/modules/images/fetchpriority/can-load.php b/modules/images/fetchpriority/can-load.php
new file mode 100644
index 0000000000..d521aaa9ee
--- /dev/null
+++ b/modules/images/fetchpriority/can-load.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Can load function to determine if the Fetchpriority feature is already available in WordPress core.
+ *
+ * @since   n.e.x.t
+ * @package performance-lab
+ */
+
+return static function() {
+	return ! function_exists( 'wp_get_loading_optimization_attributes' );
+};
diff --git a/modules/images/fetchpriority/hooks.php b/modules/images/fetchpriority/hooks.php
index d8462de950..700b134013 100644
--- a/modules/images/fetchpriority/hooks.php
+++ b/modules/images/fetchpriority/hooks.php
@@ -67,3 +67,19 @@ function fetchpriority_render_generator() {
 	}
 }
 add_action( 'wp_head', 'fetchpriority_render_generator' );
+
+// Show an admin notice if fetchpriority is already available in WordPress core (only relevant for the standalone plugin).
+if ( function_exists( 'wp_get_loading_optimization_attributes' ) && ! str_starts_with( FETCHPRIORITY_VERSION, 'Performance Lab ' ) ) {
+	add_action(
+		'admin_notices',
+		static function() {
+			?>
+			<div class="notice notice-warning">
+				<p>
+					<?php esc_html_e( 'Fetchpriority is already part of your WordPress version. Please deactivate the Fetchpriority plugin.', 'performance-lab' ); ?>
+				</p>
+			</div>
+			<?php
+		}
+	);
+}

From 8c9daa981f219ef02fbc9ad1e26298d3bc894fea Mon Sep 17 00:00:00 2001
From: Felix Arntz <felixarntz@google.com>
Date: Wed, 28 Jun 2023 11:13:20 -0700
Subject: [PATCH 2/2] Update Fetchpriority standalone plugin readme and bump
 version.

---
 modules/images/fetchpriority/readme.txt | 8 ++++++--
 plugins.json                            | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/images/fetchpriority/readme.txt b/modules/images/fetchpriority/readme.txt
index 031851c9a3..ace2dcba60 100644
--- a/modules/images/fetchpriority/readme.txt
+++ b/modules/images/fetchpriority/readme.txt
@@ -2,9 +2,9 @@
 
 Contributors:      wordpressdotorg
 Requires at least: 6.1
-Tested up to:      6.2
+Tested up to:      6.3
 Requires PHP:      5.6
-Stable tag:        1.0.0
+Stable tag:        1.1.0
 License:           GPLv2 or later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Tags:              performance, images, fetchpriority
@@ -47,6 +47,10 @@ Contributions are always welcome! Learn more about how to get involved in the [C
 
 == Changelog ==
 
+= 1.1.0 =
+
+* Display admin notice to deactivate the plugin if feature already available in WordPress core. ([769](https://github.com/WordPress/performance/pull/769))
+
 = 1.0.0 =
 
 * Initial release of the Fetchpriority plugin as a standalone plugin. ([704](https://github.com/WordPress/performance/pull/704))
diff --git a/plugins.json b/plugins.json
index 900014c066..a2e918b7db 100644
--- a/plugins.json
+++ b/plugins.json
@@ -1,7 +1,7 @@
 {
   "images/fetchpriority": {
     "slug": "fetchpriority",
-    "version": "1.0.0"
+    "version": "1.1.0"
   },
   "images/webp-uploads": {
     "slug": "webp-uploads",