From 80315b33c4ff6375b75fb5c3a16b89220dfba28f Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Wed, 15 Nov 2023 17:47:20 +0000 Subject: [PATCH] Remove unintended changes introduced in [57112]. Unprops jorbin. Built from https://develop.svn.wordpress.org/branches/6.4@57113 git-svn-id: http://core.svn.wordpress.org/branches/6.4@56624 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-privacy-policy-content.php | 8 ++++---- wp-admin/includes/update-core.php | 2 +- wp-admin/privacy-policy-guide.php | 2 +- wp-config-sample.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/general-template.php | 2 +- wp-includes/js/colorpicker.js | 2 +- wp-includes/version.php | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wp-admin/includes/class-wp-privacy-policy-content.php b/wp-admin/includes/class-wp-privacy-policy-content.php index d676875932..a64d043233 100644 --- a/wp-admin/includes/class-wp-privacy-policy-content.php +++ b/wp-admin/includes/class-wp-privacy-policy-content.php @@ -529,7 +529,7 @@ final class WP_Privacy_Policy_Content { if ( $description ) { /* translators: Privacy policy tutorial. */ - $strings[] = '

' . __( 'In this subsection you should list the cookies your website uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '

'; + $strings[] = '

' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '

'; } else { /* translators: Default privacy policy text. */ $strings[] = '

' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '

'; @@ -577,7 +577,7 @@ final class WP_Privacy_Policy_Content { if ( $description ) { /* translators: Privacy policy tutorial. */ - $strings[] = '

' . __( 'In this section you should explain how long you retain personal data collected or processed by the website. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '

'; + $strings[] = '

' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '

'; } else { /* translators: Default privacy policy text. */ $strings[] = '

' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '

'; @@ -641,14 +641,14 @@ final class WP_Privacy_Policy_Content { /* translators: Default privacy policy heading. */ $strings[] = '

' . __( 'What third parties we receive data from' ) . '

'; /* translators: Privacy policy tutorial. */ - $strings[] = '

' . __( 'If your website receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '

'; + $strings[] = '

' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '

'; } if ( $description ) { /* translators: Default privacy policy heading. */ $strings[] = '

' . __( 'What automated decision making and/or profiling we do with user data' ) . '

'; /* translators: Privacy policy tutorial. */ - $strings[] = '

' . __( 'If your website provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '

'; + $strings[] = '

' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '

'; } if ( $description ) { diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index ee710d3df3..c767834fef 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -1008,7 +1008,7 @@ $_new_bundled_files = array( * Upgrades the core of WordPress. * * This will create a .maintenance file at the base of the WordPress directory - * to ensure that people can not access the website, when the files are being + * to ensure that people can not access the web site, when the files are being * copied to their locations. * * The files in the `$_old_files` list will be removed and the new files diff --git a/wp-admin/privacy-policy-guide.php b/wp-admin/privacy-policy-guide.php index f14ade1619..cf0c41f7a4 100644 --- a/wp-admin/privacy-policy-guide.php +++ b/wp-admin/privacy-policy-guide.php @@ -73,7 +73,7 @@ wp_admin_notice(

-

+

diff --git a/wp-config-sample.php b/wp-config-sample.php index 6c4ea5f376..feb1137f39 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -3,7 +3,7 @@ * The base configuration for WordPress * * The wp-config.php creation script uses this file during the installation. - * You don't have to use the website, you can copy this file to "wp-config.php" + * You don't have to use the web site, you can copy this file to "wp-config.php" * and fill in the values. * * This file contains the following configurations: diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 3d2e1cdc0a..cb490ee176 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -6107,7 +6107,7 @@ function iis7_supports_permalinks() { * easily update the xml configuration file, hence we just bail out and tell user that * pretty permalinks cannot be used. * - * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the website. When + * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'. * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs * via ISAPI then pretty permalinks will not work. diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 17cce96074..fafbfcbcd9 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -3443,7 +3443,7 @@ function wp_site_icon() { /** * Prints resource hints to browsers for pre-fetching, pre-rendering - * and pre-connecting to websites. + * and pre-connecting to web sites. * * Gives hints to browsers to prefetch specific pages or render them * in the background, to perform DNS lookups or to begin the connection diff --git a/wp-includes/js/colorpicker.js b/wp-includes/js/colorpicker.js index 83e0488d56..61c94bb9b3 100644 --- a/wp-includes/js/colorpicker.js +++ b/wp-includes/js/colorpicker.js @@ -5,7 +5,7 @@ // NOTICE: You may use this code for any purpose, commercial or // private, without any further permission from the author. You may // remove this notice from your final code if you wish, however it is -// appreciated by the author if at least my website address is kept. +// appreciated by the author if at least my web site address is kept. // // You may *NOT* re-distribute this code in any way except through its // use. That means, you can include it in your product, or your web diff --git a/wp-includes/version.php b/wp-includes/version.php index 5a7ca85389..31ec04ef90 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4.2-alpha-57112'; +$wp_version = '6.4.2-alpha-57113'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.