From 1dfbe95995fa018b770e50a90ca1ecb886f503ca Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Thu, 3 May 2018 18:32:25 +0000 Subject: [PATCH] Privacy: Move privacy policy page to Settings menu for consistency. The page was originally placed under Tools so that it would be grouped with the pages to export and erase personal data, since they're all part of the effort to bring privacy management tools to Core ahead of GDPR's deadline. After more consideration, though, it makes sense to move this page to the Settings menu, since it's fundamental purpose is to configure an option, rather than to facilitate a recurring task. This keeps all of the configuration pages in a single place, making them consistent and easier to find. Exporting and erasing personal data are recurring tasks, so they still make sense under the Tools menu. Props xkon, helen, melchoyce, allendav, desrosj, ocean90, azaozz. Merges [43145] to the 4.9 branch. Fixes #43873. Built from https://develop.svn.wordpress.org/branches/4.9@43152 git-svn-id: http://core.svn.wordpress.org/branches/4.9@42981 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/menu.php | 2 +- wp-admin/privacy.php | 9 ++++----- wp-includes/version.php | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/wp-admin/menu.php b/wp-admin/menu.php index 7f172356bc..6082da9c48 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -244,7 +244,6 @@ $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-ic $submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' ); $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' ); $submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' ); - $submenu['tools.php'][20] = array( __( 'Privacy' ), 'manage_options', 'privacy.php' ); if ( is_multisite() && !is_main_site() ) $submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' ); if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE ) @@ -257,6 +256,7 @@ $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', $submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php'); $submenu['options-general.php'][30] = array(__('Media'), 'manage_options', 'options-media.php'); $submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php'); + $submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_options', 'privacy.php' ); $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group diff --git a/wp-admin/privacy.php b/wp-admin/privacy.php index 47dced44b6..ea38c8e36a 100644 --- a/wp-admin/privacy.php +++ b/wp-admin/privacy.php @@ -1,6 +1,6 @@ add_help_tab( array( 'id' => 'privacy', 'title' => __( 'Privacy' ), - 'content' => '

' . __( 'This page provides tools with which you can manage your user’s personal data and site’s privacy policy.' ) . '

', + 'content' => '

' . __( 'This page provides settings with which you can manage your site’s privacy policy.' ) . '

', ) ); get_current_screen()->set_help_sidebar( @@ -123,8 +123,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

- +

@@ -205,7 +204,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); 'create-page' ) ); ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 5453e45b89..946c81a895 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9.6-alpha-43151'; +$wp_version = '4.9.6-alpha-43152'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.