Ticket #46884: 46884.3.patch

src/wp-admin/network/settings.php

@@ -75 +75 @@
                 'registrationnotification'    => 'no',
                 'upload_space_check_disabled' => 1,
                 'add_new_users'               => 0,
+                'privacy_permissions'         => 1,
         );
         foreach ( $checked_options as $option_name => $option_unchecked_value ) {
                 if ( ! isset( $_POST[ $option_name ] ) ) {
@@ -106 +107 @@
                 'WPLANG',
                 'new_admin_email',
                 'first_comment_email',
+                'privacy_permissions',
         );
 
         // Handle translation installation.
@@ -490 +492 @@
                         <?php
                 endif;
                 ?>
-
+                <h2><?php _e( 'Privacy Settings' ); ?></h2>
+                <table id="menu" class="form-table">
+                        <tr>
+                                <th scope="row"><?php _e( 'Privacy policy permissions' ); ?></th>
+                                <?php
+                                        if ( ! get_site_option( 'privacy_permissions' ) ) {
+                                                update_site_option( 'privacy_permissions', 'super_admin' );
+                                        }
+                                        $privacy_permissions = get_site_option( 'privacy_permissions' );
+                                ?>
+                                <td>
+                                        <fieldset>
+                                                <legend class="screen-reader-text"><?php _e( 'Privacy policy permisisons' ); ?></legend>
+                                                <label><input name="privacy_permissions" type="radio" id="privacy-super-admins" value="super_admin"<?php checked( $privacy_permissions, 'super_admin' ); ?> /> <?php _e( 'Only allow Super Admins to edit the privacy policy page' ); ?></label><br />
+                                                <label><input name="privacy_permissions" type="radio" id="privacy-admins" value="admin"<?php checked( $privacy_permissions, 'admin' ); ?> /> <?php _e( 'Admins can edit their own sites\'s privacy policy page'); ?></label><br />
+                                        </fieldset>
+                                </td>
+                        </tr>
+                </table>
                 <?php
                 /**
                  * Fires at the end of the Network Settings form, before the submit button.

src/wp-includes/capabilities.php

@@ -589 +589 @@
                 case 'erase_others_personal_data':
                 case 'manage_privacy_options':
                         $caps[] = is_multisite() ? 'manage_network' : 'manage_options';
+                        if ( is_multisite() && 'admin' === get_site_option( 'privacy_permissions' ) && 'manage_options' ) {
+                                $caps[] = 'manage_options';
+                        } elseif ( is_multisite() ) {
+                                $caps[] = 'manage_network';
+                        } else {
+                                $caps[] = 'manage_options';
+                        }
                         break;
                 default:
                         // Handle meta capabilities for custom post types.