diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index 1603f2d601..5cc0261fce 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -1232,14 +1232,18 @@ final class WP_Privacy_Policy_Content { private function __construct() {} /** - * Add privacy information to the postbox shown when editing the privacy policy. + * Add content to the postbox shown when editing the privacy policy. + * + * Plugins and themes should suggest text for inclusion in the site's privacy policy. + * The suggested text should contain information about any functionality that affects user privacy, + * and will be shown in the Suggested Privacy Policy Content postbox. * * Intended for use from `wp_add_privacy_policy_content()`. * - * $since 5.0.0 + * $since 4.9.6 * - * @param string $plugin_name The plugin'as name. Will be shown in the privacy policy metabox. - * @param string $policy_text The content that should appear in the site's privacy policy. + * @param string $plugin_name The name of the plugin or theme that is suggesting content for the site's privacy policy. + * @param string $policy_text The suggested content for inclusion in the policy. */ public static function add( $plugin_name, $policy_text ) { if ( empty( $plugin_name ) || empty( $policy_text ) ) { diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 85d6ef9881..d794a8acc6 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -1898,14 +1898,22 @@ function plugin_sandbox_scrape( $plugin ) { } /** - * Helper function for adding plugin specific information to the postbox shown when editing the privacy policy. + * Helper function for adding content to the postbox shown when editing the privacy policy. + * + * Plugins and themes should suggest text for inclusion in the site's privacy policy. + * The suggested text should contain information about any functionality that affects user privacy, + * and will be shown in the Suggested Privacy Policy Content postbox. + * + * A plugin or theme can use this function multiple times as long as it will help to better present + * the suggested policy content. For example modular plugins such as WooCommerse or Jetpack + * can add or remove suggested content depending on the modules/extensions that are enabled. * * Intended for use with the `'admin_init'` action. * * @since 4.9.6 * - * @param string $plugin_name The plugin'as name. Will be shown in the privacy policy metabox. - * @param string $policy_text The content that should appear in the site's privacy policy. + * @param string $plugin_name The name of the plugin or theme that is suggesting content for the site's privacy policy. + * @param string $policy_text The suggested content for inclusion in the policy. * For more information see the Plugins Handbook https://developer.wordpress.org/plugins/. */ function wp_add_privacy_policy_content( $plugin_name, $policy_text ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 8683730b52..db7bb668ee 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-43114'; +$wp_version = '4.9.6-alpha-43115'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.