Ticket #8734: 8734.02.feedback.patch

src/bp-core/bp-core-community-visibility.php

@@ -126 +126 @@
 add_filter( 'bp_activity_enable_feeds', 'bp_community_visibility_rss_feed_access_protection', 10, 2 );
 
 /**
- * Get the community visibility value calculated from the 
+ * Get the community visibility value calculated from the
  * saved visibility setting.
  *
  * @since 12.0.0
  *
- * @param string $component Whether we want the visibility for a component 
+ * @param string $component Whether we want the visibility for a component
  *                          or for all components.
- * 
+ *
  * @return arrary|string $retval The calculated visbility settings for the site.
  */
 function bp_community_visibility_get_visibility( $component = 'all' ) {
         $retval      = 'anyone';
-        $saved_value = get_option( '_bp_community_visibility' );
+        $saved_value = (array) get_option( '_bp_community_visibility', array() );
 
         // If the global value has not been set, we assume that the site is open.
         if ( ! isset( $saved_value['global'] ) ) {
@@ -147 +147 @@
 
         if ( 'all' === $component ) {
                 // Build the component list.
-                $retval = array( 
-                        'global' => $saved_value['global'] 
+                $retval = array(
+                        'global' => $saved_value['global']
                 );
                 $directory_pages = bp_core_get_directory_pages();
                 foreach ( $directory_pages as $component_id => $component_page ) {
@@ -164 +164 @@
         }
 
         /**
-         * Filter the community visibility value calculated from the 
+         * Filter the community visibility value calculated from the
          * saved visibility setting.
          *
          * @since 12.0.0
@@ -177 +177 @@
 
 /**
  * Sanitize the visibility setting when it is saved.
- * 
+ *
  * @since 12.0.0
- * 
+ *
  * @param mixed $saved_value The value passed to the save function.
  */
 function bp_community_visibility_sanitize_setting( $saved_value ) {

src/bp-core/bp-core-functions.php

@@ -991 +991 @@
                 $pages = get_posts(
                         array(
                                 'post__not_in' => array( $post_ID ),
-                                'post_status'  => array( 'publish', 'bp_restricted' ),
+                                'post_status'  => bp_core_get_directory_pages_stati(),
                                 'post_type'    => array( 'buddypress', 'page' ),
                         )
                 );

src/bp-core/classes/class-bp-component.php

@@ -1257 +1257 @@
          *
          * @since 12.0.0
          *
-         * @param  null     $retval A null value to use the regular WP Query.
-         * @param  WP_Query $query  The WP Query object.
+         * @param  null     $posts A null value to use the regular WP Query.
+         * @param  WP_Query $query The WP Query object.
          * @return null|array Null if not displaying a BuddyPress page.
-         *                    An array containing the BuddyPress directory post otherwise.
+         *                    An array containing the BuddyPress directory page otherwise.
          */
-        public function pre_query( $retval = null, $query = null ) {
+        public function pre_query( $posts = null, $query = null ) {
                 remove_filter( 'posts_pre_query', array( $this, 'pre_query' ), 10 );
 
                 $queried_object = $query->get_queried_object();
@@ -1271 +1271 @@
                         $component = bp_core_get_component_from_directory_page_id( $queried_object->ID );
                         if ( $component && bp_current_user_can( 'bp_read', array( 'bp_component' => $component ) ) ) {
                                 // Only include the queried directory post into returned posts.
-                                $retval = array( $queried_object );
+                                $posts = array( $queried_object );
 
                                 // Reset some query flags.
                                 $query->is_home       = false;
@@ -1304 +1304 @@
                                         'ID'             => 0,
                                         'post_type'      => 'buddypress',
                                         'post_name'      => 'restricted',
-                                        'post_title'     => __( 'Members-only area', 'bp-rewrites' ),
+                                        'post_title'     => __( 'Members-only area', 'buddypress' ),
                                         'post_content'   => bp_buffer_template_part( 'assets/utils/restricted-access-message', null, false ),
                                         'comment_status' => 'closed',
                                         'comment_count'  => 0,
@@ -1315 +1315 @@
                                 $query->queried_object_id = $query->queried_object->ID;
 
                                 // Reset the posts.
-                                $retval = array( $query->queried_object );
+                                $posts = array( $query->queried_object );
 
                                 // Reset some WP Query properties.
                                 $query->found_posts   = 1;
@@ -1332 +1332 @@
 
                                 // Make sure no comments are displayed for this page.
                                 add_filter( 'comments_pre_query', 'bp_comments_pre_query', 10, 2 );
-
-                                // @TODO: From bp-rewrites, meant to improve the button coloration.
-                                // if ( function_exists( 'wp_get_global_styles' ) ) {
-                                //      add_action( 'bp_enqueue_community_scripts', __NAMESPACE__ . '\add_bp_login_block_inline_style' );
-                                // }
                         }
 
-                        return $retval;
+                        return $posts;
                 }
         }
 

src/bp-core/classes/class-bp-core.php

@@ -397 +397 @@
                 parent::register_post_types();
         }
 
-        /**
-         * Set up the component post statuses.
-         *
-         * @since 12.0.0
-         */
-        public function register_post_statuses() {
-                register_post_status(
-                        'bp_restricted',
-                        array(
-                                'label'    => _x( 'Restricted to members', '`buddypress` post type post status', 'buddypress' ),
-                                'public'   => false,
-                                'internal' => true,
-                        )
-                );
-
-                parent::register_post_statuses();
-        }
-
         /**
          * Parse the WP_Query and eventually set the BP Search mechanism.
          *

src/bp-templates/bp-legacy/buddypress/assets/utils/restricted-access-message.php

@@ -14 +14 @@
 }
 ?>
 <!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center"><?php esc_html_e( 'This community area is accessible to logged-in members only.', 'bp-rewrites' ); ?></p>
+<p class="has-text-align-center"><?php esc_html_e( 'This community area is accessible to logged-in members only.', 'buddypress' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:columns -->

src/bp-templates/bp-nouveau/buddypress/assets/utils/restricted-access-message.php

@@ -14 +14 @@
 }
 ?>
 <!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center"><?php esc_html_e( 'This community area is accessible to logged-in members only.', 'bp-rewrites' ); ?></p>
+<p class="has-text-align-center"><?php esc_html_e( 'This community area is accessible to logged-in members only.', 'buddypress' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:columns -->