From d1fd71374d6f13e91a63502c225741eff3940438 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@gmail.com>
Date: Fri, 16 Nov 2018 15:02:07 -0500
Subject: [PATCH] Display the privacy policy help notice with the
 `admin_notices` action hook.

The new editor does not support the `edit_form_after_title` action hook. Because WordPress Core uses this hook to output the notice, it is not printed to the screen.

After #11604 is merged, legacy style admin notices (`<div class="notice">...notice content...</div>`) will be consumed by the Notices API and displayed. This change ensures that when #11604 is merged the privacy policy notice will appear again when editing the privacy policy page.
---
 lib/compat.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/compat.php b/lib/compat.php
index ff0938c496828a..01c2118ef19056 100644
--- a/lib/compat.php
+++ b/lib/compat.php
@@ -116,7 +116,6 @@ function gutenberg_wpautop( $content ) {
 remove_filter( 'the_content', 'wpautop' );
 add_filter( 'the_content', 'gutenberg_wpautop', 6 );
 
-
 /**
  * Check if we need to load the block warning in the Classic Editor.
  *
@@ -304,3 +303,22 @@ function gutenberg_warn_classic_about_blocks() {
 		</script>
 	<?php
 }
+
+/**
+ * Display the privacy policy help notice.
+ *
+ * In Gutenberg, the `edit_form_after_title` hook is not supported. Because
+ * WordPress Core uses this hook to display this notice, it never displays.
+ * Outputting the notice on the `admin_notices` hook allows Gutenberg to
+ * consume the notice and display it with the Notices API.
+ */
+function gutenberg_show_privacy_policy_help_text() {
+	if ( is_gutenberg_page() ) {
+		remove_action( 'edit_form_after_title', array( 'WP_Privacy_Policy_Content', 'notice' ) );
+
+		global $post;
+
+		WP_Privacy_Policy_Content::notice( $post );
+	}
+}
+add_action( 'admin_notices', 'gutenberg_show_privacy_policy_help_text' );