Changeset 43243 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

05/11/2018 03:43:36 PM (6 years ago)

Author:

azaozz

Message:

Privacy: make creating a privacy policy page on install multisite compatible.

See #43491.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -309 +309 @@
 
         // Privacy Policy page
-        if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/misc.php' );
-        }
-
-        $privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
-        $privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
-
-        $wpdb->insert(
-            $wpdb->posts, array(
-                'post_author'           => $user_id,
-                'post_date'             => $now,
-                'post_date_gmt'         => $now_gmt,
-                'post_content'          => $privacy_policy_content,
-                'post_excerpt'          => '',
-                'comment_status'        => 'closed',
-                'post_title'            => __( 'Privacy Policy' ),
-                /* translators: Privacy Policy page slug */
-                'post_name'             => __( 'privacy-policy' ),
-                'post_modified'         => $now,
-                'post_modified_gmt'     => $now_gmt,
-                'guid'                  => $privacy_policy_guid,
-                'post_type'             => 'page',
-                'post_status'           => 'draft',
-                'to_ping'               => '',
-                'pinged'                => '',
-                'post_content_filtered' => '',
-            )
-        );
-        $wpdb->insert(
-            $wpdb->postmeta, array(
-                'post_id'    => 3,
-                'meta_key'   => '_wp_page_template',
-                'meta_value' => 'default',
-            )
-        );
-        update_option( 'wp_page_for_privacy_policy', 3 );
+        if ( is_multisite() ) {
+            // Disable by default unless the suggested content is provided.
+            $privacy_policy_content = get_site_option( 'default_privacy_policy_content' );
+        } else {
+            if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
+                include_once( ABSPATH . 'wp-admin/includes/misc.php' );
+            }
+
+            $privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
+        }
+
+        if ( ! empty( $privacy_policy_content ) ) {
+            $privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
+
+            $wpdb->insert(
+                $wpdb->posts, array(
+                    'post_author'           => $user_id,
+                    'post_date'             => $now,
+                    'post_date_gmt'         => $now_gmt,
+                    'post_content'          => $privacy_policy_content,
+                    'post_excerpt'          => '',
+                    'comment_status'        => 'closed',
+                    'post_title'            => __( 'Privacy Policy' ),
+                    /* translators: Privacy Policy page slug */
+                    'post_name'             => __( 'privacy-policy' ),
+                    'post_modified'         => $now,
+                    'post_modified_gmt'     => $now_gmt,
+                    'guid'                  => $privacy_policy_guid,
+                    'post_type'             => 'page',
+                    'post_status'           => 'draft',
+                    'to_ping'               => '',
+                    'pinged'                => '',
+                    'post_content_filtered' => '',
+                )
+            );
+            $wpdb->insert(
+                $wpdb->postmeta, array(
+                    'post_id'    => 3,
+                    'meta_key'   => '_wp_page_template',
+                    'meta_value' => 'default',
+                )
+            );
+            update_option( 'wp_page_for_privacy_policy', 3 );
+        }
 
         // Set up default widgets for default theme.