Changeset 43255

Timestamp:

05/14/2018 02:06:28 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: exclude the wrapper from the default policy content.

Props azaozz.
Merges [43242] to the 4.9 branch.
Fixes #44048.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/misc.php (modified) (2 diffs)

branches/4.9/src/wp-admin/includes/misc.php

@@ -1643 +1643 @@
     public static function get_default_content( $descr = false ) {
         $suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
+        $content = '';
 
         // Start of the suggested privacy policy text.
-        $content =
-            '<div class="wp-suggested-text">' .
+        $descr && $content .=
+            '<div class="wp-suggested-text">';
+        $content .=
             '<h2>' . __( 'Who we are' ) . '</h2>';
         $descr && $content .=
@@ -1759 +1761 @@
             '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
         $descr && $content .=
-            '<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>';
-        $content .=
+            '<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>' .
             '</div>';
         // End of the suggested privacy policy text.