Ticket #43965: 43965.2.diff

src/wp-admin/includes/admin-filters.php

@@ -139 +139 @@
 // Privacy policy text changes check.
 add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 20 );
 
-// Show a "postbox" with the text suggestions for a privacy policy.
-add_action( 'edit_form_after_title', array( 'WP_Privacy_Policy_Content', 'privacy_policy_postbox' ) );
+// Show a "metabox" with the text suggestions for a privacy policy.
+function add_privacy_policies_metabox( $post_type, $post ) {
+        $privacy_policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+        $post_id                = $post->ID;
 
+        if ( ! empty( $privacy_policy_page_id ) && $post_id == $privacy_policy_page_id ) {
+                add_meta_box(
+                        'Privacy Policies',
+                        __( 'Privacy Policies' ),
+                        array( 'WP_Privacy_Policy_Content', 'privacy_policy_postbox' ),
+                        'page',
+                        'normal',
+                        'high'
+                );
+        }
+}
+add_action( 'add_meta_boxes', 'add_privacy_policies_metabox', 10, 2 );
+
 // Add the suggested policy text from WordPress.
 add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 15 );
 

src/wp-admin/includes/misc.php

@@ -1611 +1611 @@
 
                 ?>
                 <div id="privacy-text-box" class="privacy-text-box postbox <?php echo postbox_classes( 'privacy-text-box', 'page' ); ?>">
-                        <button type="button" class="handlediv" aria-expanded="true">
-                                <span class="screen-reader-text"><?php _e( 'Toggle panel: Suggested privacy policy text' ); ?></span>
-                                <span class="toggle-indicator" aria-hidden="true"></span>
-                        </button>
-                        <div class="privacy-text-box-head hndle">
+                        <div class="privacy-text-box-head">
                                 <h2><?php _e( 'This suggested privacy policy text comes from plugins and themes you have installed.' ); ?></h2>
                                 <p>
                                         <?php _e( 'We suggest reviewing this text then copying and pasting it into your privacy policy page.' ); ?>

src/wp-admin/js/post.js

@@ -1269 +1269 @@
         } );
 
 } )( jQuery, new wp.utils.WordCounter() );
-
-( function( $ ) {
-        // Privacy policy postbox, copy button.
-        $( document ).on( 'click', function( event ) {
-                var $target = $( event.target );
-                var node, range;
-
-                if ( $target.is( 'button.privacy-text-copy' ) ) {
-                        node = $target.parent().parent().find( 'div.policy-text' )[0];
-
-                        if ( node ) {
-                                try {
-                                        window.getSelection().removeAllRanges();
-                                        range = document.createRange();
-                                        range.selectNodeContents( node );
-                                        window.getSelection().addRange( range );
-
-                                        document.execCommand( 'copy' );
-                                        window.getSelection().removeAllRanges();
-                                } catch ( er ) {}
-                        }
-                } else if ( $target.is( 'button.policy-text-more' ) ) {
-                        $target.parents( '.privacy-text-section' ).removeClass( 'folded' )
-                                .find( '.policy-text' ).attr( 'aria-expanded', 'true' );
-                } else if ( $target.is( 'button.policy-text-less' ) ) {
-                        $target.parents( '.privacy-text-section' ).addClass( 'folded' )
-                                .find( '.policy-text' ).attr( 'aria-expanded', 'false' );
-                }
-        });
-
-} )( jQuery );

src/wp-admin/js/postbox.js

@@ -444 +444 @@
         };
 
 }(jQuery));
+
+( function( $ ) {
+        // Privacy policy postbox, copy button.
+        $( document ).on( 'click', function( event ) {
+                var $target = $( event.target );
+                var node, range;
+
+                if ( $target.is( 'button.privacy-text-copy' ) ) {
+                        node = $target.parent().parent().find( 'div.policy-text' )[0];
+
+                        if ( node ) {
+                                try {
+                                        window.getSelection().removeAllRanges();
+                                        range = document.createRange();
+                                        range.selectNodeContents( node );
+                                        window.getSelection().addRange( range );
+
+                                        document.execCommand( 'copy' );
+                                        window.getSelection().removeAllRanges();
+                                } catch ( er ) {}
+                        }
+                } else if ( $target.is( 'button.policy-text-more' ) ) {
+                        $target.parents( '.privacy-text-section' ).removeClass( 'folded' )
+                                .find( '.policy-text' ).attr( 'aria-expanded', 'true' );
+                } else if ( $target.is( 'button.policy-text-less' ) ) {
+                        $target.parents( '.privacy-text-section' ).addClass( 'folded' )
+                                .find( '.policy-text' ).attr( 'aria-expanded', 'false' );
+                }
+        });
+
+} )( jQuery );
+ No newline at end of file