Ticket #43926: 43926.diff

src/wp-admin/privacy.php

@@ -61 +61 @@
                 } else {
                         update_option( 'wp_page_for_privacy_policy', $privacy_policy_page_id );
 
-                        add_settings_error(
-                                'page_for_privacy_policy',
-                                'page_for_privacy_policy',
-                                sprintf(
-                                        /* translators: %s: URL to edit Privacy Policy page */
-                                        __( 'Your privacy policy page created successfully. You&#8217;ll want to <a href="%s">review and edit your policy</a> next.' ),
-                                        'post.php?post=' . $privacy_policy_page_id . '&action=edit'
-                                ),
-                                'updated'
-                        );
+                        wp_redirect( 'post.php?post=' . $privacy_policy_page_id . '&action=edit' );
+                        exit;
                 }
         }
 }
@@ -197 +189 @@
                                         submit_button( __( 'Use This Page' ), 'primary', 'submit', false, array( 'id' => 'set-page' ) );
                                         ?>
                                 </form>
+                                <?php if ( ! $privacy_policy_page_exists ) : ?>
+                                        <form method="post" action="">
+                                                <input type="hidden" name="action" value="create-privacy-page" />
+                                                <span>
+                                                        <?php _e( 'Or create a new page:' ); ?>
+                                                </span>
+                                                <?php
+                                                wp_nonce_field( 'create-privacy-page' );
 
-                                <form method="post" action="">
-                                        <input type="hidden" name="action" value="create-privacy-page" />
-                                        <span>
-                                                <?php _e( 'Or create a new page:' ); ?> 
-                                        </span>
-                                        <?php
-                                        wp_nonce_field( 'create-privacy-page' );
-        
-                                        submit_button( __( 'Create New Page' ), 'primary', 'submit', false, array( 'id' => 'create-page' ) );
-                                        ?>
-                                </form>
+                                                submit_button( __( 'Create New Page' ), 'primary', 'submit', false, array( 'id' => 'create-page' ) );
+                                                ?>
+                                        </form>
+                                <?php endif; ?>
                         </td>
                 </tr>
         </table>