WordPress.org
Get WordPress

Make WordPress Core

Ticket #44051: 44051.2.diff

File 44051.2.diff, 22.4 KB (added by ovann86, 7 years ago)

Change argument name from 'descr' to 'include_descriptions' to make it's role easier to understand.

  • src/wp-admin/includes/misc.php

     
    16861686         *
    16871687         * @since 4.9.6
    16881688         *
    1689          * @param bool $descr Whether to include the descriptions undet the section headings. Default false.
     1689         * @param bool $include_descriptions Whether to include the descriptions under the section headings. Default false.
    16901690         * @return string The default policy content.
    16911691         */
    1692         public static function get_default_content( $descr = false ) {
    1693                 $suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
    1694                 $content = '';
     1692        public static function get_default_content( $include_descriptions = false ) {
     1693                $suggested_text = '';
     1694                $content        = '';
    16951695
     1696                if ( $include_descriptions ) {
     1697                        $suggested_text = '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>';
     1698                }
     1699
    16961700                // Start of the suggested privacy policy text.
    1697                 $descr && $content .=
    1698                         '<div class="wp-suggested-text">';
     1701                if ( $include_descriptions ) {
     1702                        $content .=
     1703                                '<div class="wp-suggested-text">';
     1704                }
     1705
    16991706                $content .=
    17001707                        '<h2>' . __( 'Who we are' ) . '</h2>';
    1701                 $descr && $content .=
    1702                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
    1703                         '<p class="privacy-policy-tutorial">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>';
     1708
     1709                if ( $include_descriptions ) {
     1710                        $content .=
     1711                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
     1712                                '<p class="privacy-policy-tutorial">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>';
     1713                }
     1714
    17041715                $content .=
    17051716                        /* translators: %s Site URL */
    17061717                        '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>' .
    17071718
    17081719                        '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>';
    1709                 $descr && $content .=
    1710                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include personal data, such as name, email address, personal account preferences; transactional data, such as purchase information; and technical data, such as information about cookies.' ) . '</p>' .
    1711                         '<p class="privacy-policy-tutorial">' . __( 'You should also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '</p>' .
    1712                         '<p class="privacy-policy-tutorial">' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '</p>' .
    1713                         '<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user&#8217;s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
    1714                         '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '</p>';
    17151720
     1721                if ( $include_descriptions ) {
     1722                        $content .=
     1723                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include personal data, such as name, email address, personal account preferences; transactional data, such as purchase information; and technical data, such as information about cookies.' ) . '</p>' .
     1724                                '<p class="privacy-policy-tutorial">' . __( 'You should also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '</p>' .
     1725                                '<p class="privacy-policy-tutorial">' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '</p>' .
     1726                                '<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user&#8217;s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
     1727                                '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '</p>';
     1728                }
     1729
    17161730                $content .=
    17171731                        '<h3>' . __( 'Comments' ) . '</h3>';
    1718                 $descr && $content .=
    1719                         '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>';
     1732
     1733                if ( $include_descriptions ) {
     1734                        $content .=
     1735                                '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>';
     1736                }
     1737
    17201738                $content .=
    17211739                        '<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor&#8217;s IP address and browser user agent string to help spam detection.' ) . '</p>' .
    17221740                        '<p>' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '</p>' .
    17231741
    17241742                        '<h3>' . __( 'Media' ) . '</h3>';
    1725                 $descr && $content .=
    1726                         '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '</p>';
     1743
     1744                if ( $include_descriptions ) {
     1745                        $content .=
     1746                                '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '</p>';
     1747                }
     1748
    17271749                $content .=
    17281750                        '<p>' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>' .
    17291751
    17301752                        '<h3>' . __( 'Contact forms' ) . '</h3>';
    1731                 $descr && $content .=
    1732                         '<p class="privacy-policy-tutorial">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</p>';
    17331753
     1754                if ( $include_descriptions ) {
     1755                        $content .=
     1756                                '<p class="privacy-policy-tutorial">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</p>';
     1757                }
     1758
    17341759                $content .=
    17351760                        '<h3>' . __( 'Cookies' ) . '</h3>';
    1736                 $descr && $content .=
    1737                         '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
     1761
     1762                if ( $include_descriptions ) {
     1763                        $content .=
     1764                                '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
     1765                }
     1766
    17381767                $content .=
    17391768                        '<p>' . $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.' ) . '</p>' .
    17401769                        '<p>' . __( 'If you have an account and you log in to this site, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>' .
    … …  
    17461775                        '<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracing your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p>' .
    17471776
    17481777                        '<h3>' . __( 'Analytics' ) . '</h3>';
    1749                 $descr && $content .=
    1750                         '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider&#8217;s privacy policy, if any.' ) . '</p>' .
    1751                         '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</p>';
    17521778
     1779                if ( $include_descriptions ) {
     1780                        $content .=
     1781                                '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider&#8217;s privacy policy, if any.' ) . '</p>' .
     1782                                '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</p>';
     1783                }
     1784
    17531785                $content .=
    17541786                        '<h2>' . __( 'Who we share your data with' ) . '</h2>';
    1755                 $descr && $content .=
    1756                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>' .
    1757                         '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>';
    17581787
     1788                if ( $include_descriptions ) {
     1789                        $content .=
     1790                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>' .
     1791                                '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>';
     1792                }
     1793
    17591794                $content .=
    17601795                        '<h2>' . __( 'How long we retain your data' ) . '</h2>';
    1761                 $descr && $content .=
    1762                         '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
     1796
     1797                if ( $include_descriptions ) {
     1798                        $content .=
     1799                                '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
     1800                }
     1801
    17631802                $content .=
    17641803                        '<p>' . $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.' ) . '</p>' .
    17651804                        '<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p>' .
    17661805
    17671806                        '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
    1768                 $descr && $content .=
    1769                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>';
     1807
     1808                if ( $include_descriptions ) {
     1809                        $content .=
     1810                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>';
     1811                }
     1812
    17701813                $content .=
    17711814                        '<p>' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
    17721815
    17731816                        '<h2>' . __( 'Where we send your data' ) . '</h2>';
    1774                 $descr && $content .=
    1775                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
    1776                         '<p class="privacy-policy-tutorial">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>';
     1817
     1818                if ( $include_descriptions ) {
     1819                        $content .=
     1820                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
     1821                                '<p class="privacy-policy-tutorial">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>';
     1822                }
     1823
    17771824                $content .=
    17781825                        '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>';
    17791826
    17801827                        '<h2>' . __( 'Your contact information' ) . '</h2>';
    1781                 $descr && $content .=
    1782                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</p>';
    17831828
     1829                if ( $include_descriptions ) {
     1830                        $content .=
     1831                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</p>';
     1832                }
     1833
    17841834                $content .=
    17851835                        '<h2>' . __( 'Additional information' ) . '</h2>';
    1786                 $descr && $content .=
    1787                         '<p class="privacy-policy-tutorial">' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '</p>';
    17881836
     1837                if ( $include_descriptions ) {
     1838                        $content .=
     1839                                '<p class="privacy-policy-tutorial">' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '</p>';
     1840                }
     1841
    17891842                $content .=
    17901843                        '<h3>' . __( 'How we protect your data' ) . '</h3>';
    1791                 $descr && $content .=
    1792                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what measures you have taken to protect your users&#8217; data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>';
    17931844
     1845                if ( $include_descriptions ) {
     1846                        $content .=
     1847                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what measures you have taken to protect your users&#8217; data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>';
     1848                }
     1849
    17941850                $content .=
    17951851                        '<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>';
    1796                 $descr && $content .=
    1797                         '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</p>';
    17981852
     1853                if ( $include_descriptions ) {
     1854                        $content .=
     1855                                '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</p>';
     1856                }
     1857
    17991858                $content .=
    18001859                        '<h3>' . __( 'What third parties we receive data from' ) . '</h3>';
    1801                 $descr && $content .=
    1802                         '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    18031860
     1861                if ( $include_descriptions ) {
     1862                        $content .=
     1863                                '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
     1864                }
     1865
    18041866                $content .=
    18051867                        '<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>';
    1806                 $descr && $content .=
    1807                         '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    18081868
     1869                if ( $include_descriptions ) {
     1870                        $content .=
     1871                                '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
     1872                }
     1873
    18091874                $content .=
    18101875                        '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
    1811                 $descr && $content .=
    1812                         '<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>' .
    1813                         '</div>';
     1876
     1877                if ( $include_descriptions ) {
     1878                        $content .=
     1879                                '<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>' .
     1880                                '</div>';
     1881                }
    18141882                // End of the suggested privacy policy text.
    18151883
    18161884                /**