Changeset 13514

Timestamp:

07/12/2023 03:38:26 AM (14 months ago)

Author:

imath

Message:

Improve automatic third party component directory page association

1. the buddypress()->loaded_components array uses component slug as keys (not the component ID). Avoid potential problems when a component slug is very different than the component ID by looping into this array the right way when looking for components requiring a page association.
2. Make sure to use the component $root_slug and $directory_title when automatically creating a buddypress post type for orphaned components.
3. Improve the user feedback once 2. is achieved by informing they may need to refresh the site permalink settings.

Fixes #8918
Closes ​https://github.com/buddypress/buddypress/pull/127

Location:

trunk/src/bp-core

Files:

• admin/bp-core-admin-functions.php (modified) (4 diffs)
• bp-core-functions.php (modified) (3 diffs)

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

@@ -260 +260 @@
 
     // Only components with 'has_directory' require a WP page to function.
-    foreach ( array_keys( $bp->loaded_components ) as $component_id ) {
+    foreach ( $bp->loaded_components as $component_slug => $component_id ) {
         if ( ! empty( $bp->{$component_id}->has_directory ) ) {
             $wp_page_components[] = array(
@@ -291 +291 @@
     foreach ( $wp_page_components as $component ) {
         if ( ! isset( $bp->pages->{$component['id']} ) ) {
-            $orphaned_components[ $component['id'] ] = $component['name'];
+            $component_props = $component;
+            if ( isset( $bp->{$component['id']}->directory_title ) ) {
+                $component_props['title'] = $bp->{$component['id']}->directory_title;
+            } else {
+                $component_props['title'] = $component_props['name'];
+            }
+
+            if ( isset( $bp->{$component['id']}->root_slug ) ) {
+                $component_props['name'] = $bp->{$component['id']}->root_slug;
+            }
+
+            $orphaned_components[ $component['id'] ] = $component_props;
         }
     }
@@ -300 +311 @@
             // Translators: %s is the comma separated list of components needing a directory page.
             __( 'The following active BuddyPress Components do not have associated BuddyPress Pages: %s.', 'buddypress' ),
-            '<strong>' . implode( '</strong>, <strong>', array_map( 'esc_html', $orphaned_components ) ) . '</strong>'
+            '<strong>' . implode( '</strong>, <strong>', array_map( 'esc_html', wp_list_pluck( $orphaned_components, 'title' ) ) ) . '</strong>'
         );
 
@@ -310 +321 @@
             $notice      = sprintf(
                 // Translators: %s is the comma separated list of components needing a directory page.
-                __( 'A BuddyPress page has been added for the following active BuddyPress Components which did not have associated BuddyPress Pages yet: %s.', 'buddypress' ),
-                '<strong>' . implode( '</strong>, <strong>', array_map( 'esc_html', $orphaned_components ) ) . '</strong>'
+                __( 'A BuddyPress page has been added for the following active BuddyPress Components which did not have associated BuddyPress Pages yet: %s. You may need to refresh your permalink settings.', 'buddypress' ),
+                '<strong>' . implode( '</strong>, <strong>', array_map( 'esc_html', wp_list_pluck( $orphaned_components, 'title' ) ) ) . '</strong>'
             );
         }

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

@@ -851 +851 @@
     $page_titles = bp_core_get_directory_page_default_titles();
     if ( $return_pages ) {
+        $components_title = wp_list_pluck( $components, 'title' );
+        if ( ! $components_title ) {
+            $components_title = $components;
+        }
+
         // In this case the `$components` array uses Page titles as values.
-        $page_titles = bp_parse_args( $page_titles, $components );
+        $page_titles = bp_parse_args( $page_titles, $components_title );
     }
 
@@ -883 +888 @@
 
     // Create the pages.
-    foreach ( $pages_to_create as $component_name => $page_name ) {
+    foreach ( $pages_to_create as $component_name => $page_title ) {
         $existing_id = bp_core_get_directory_page_id( $component_name );
 
@@ -890 +895 @@
             $pages[ $component_name ] = (int) $existing_id;
         } else {
-            $pages[ $component_name ] = wp_insert_post( array(
+            $postarr = array(
                 'comment_status' => 'closed',
                 'ping_status'    => 'closed',
                 'post_status'    => 'publish',
-                'post_title'     => $page_name,
+                'post_title'     => $page_title,
                 'post_type'      => bp_core_get_directory_post_type(),
-            ) );
+            );
+
+            if ( isset( $components[ $component_name ]['name'] ) ) {
+                $postarr['post_name'] = $components[ $component_name ]['name'];
+            }
+
+            $pages[ $component_name ] = wp_insert_post( $postarr );
         }
     }