Changeset 13502

Timestamp:

06/13/2023 02:50:47 AM (21 months ago)

Author:

imath

Message:

buddypress post type dynamic creation for has_directory components

12.0 introduces a buddypress post type which is used to store the components directory pages into the database & replace the page post type that was used so far. It also replaced the Page association WP Admin screen with another WP Admin screen to customize all BP URLs.

In case a custom component is using a directory page and is not taking care of generating the corresponding buddypress post type entry, instead of asking for a page association in an admin notice, this entry is dynamically generated. If users are not happy with the title or slug of this entry, they can use the BP URLs settings tab to customize these afterwards.

Fixes #8918
See #4954
Closes ​https://github.com/buddypress/buddypress/pull/116

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

@@ -291 +291 @@
     foreach ( $wp_page_components as $component ) {
         if ( ! isset( $bp->pages->{$component['id']} ) ) {
-            $orphaned_components[] = $component['name'];
+            $orphaned_components[ $component['id'] ] = $component['name'];
         }
     }
 
     if ( ! empty( $orphaned_components ) ) {
-        $notice = sprintf(
+        $notice_type = 'error';
+        $notice      = sprintf(
             // 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' ),
@@ -302 +303 @@
         );
 
-        bp_core_add_admin_notice( $notice );
+        if ( 'buddypress' === bp_core_get_directory_post_type() ) {
+            $pages               = bp_core_add_page_mappings( $orphaned_components, 'keep', true );
+            $orphaned_components = array_intersect_key( $orphaned_components, $pages );
+
+            $notice_type = 'updated';
+            $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>'
+            );
+        }
+
+        bp_core_add_admin_notice( $notice, $notice_type );
     }
 
@@ -321 +334 @@
     // If there are duplicates, post a message about them.
     if ( ! empty( $dupe_names ) ) {
-        $notice = ssprintf(
+        $notice = sprintf(
             // Translators: %s is the list of directory pages associated to more than one component.
             __( 'Each BuddyPress Component needs its own BuddyPress page. The following BuddyPress Pages have more than one component associated with them: %s.', 'buddypress' ),
@@ -327 +340 @@
         );
 
-        bp_core_add_admin_notice( $notice );
+        bp_core_add_admin_notice( $notice, 'error' );
     }
 }

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

@@ -816 +816 @@
  *
  * @since 1.7.0
- *
- * @param array  $components Components to create pages for.
- * @param string $existing   'delete' if you want to delete existing page mappings
- *                           and replace with new ones. Otherwise existing page mappings
- *                           are kept, and the gaps filled in with new pages. Default: 'keep'.
- */
-function bp_core_add_page_mappings( $components, $existing = 'keep' ) {
+ * @since 12.0.0 Adds the `$return_pages` parameter.
+ *
+ * @param array   $components   Components to create pages for.
+ * @param string  $existing     'delete' if you want to delete existing page mappings
+ *                              and replace with new ones. Otherwise existing page mappings
+ *                              are kept, and the gaps filled in with new pages. Default: 'keep'.
+ * @param boolean $return_pages Whether to return the page mapping or not.
+ * @return void|array
+ */
+function bp_core_add_page_mappings( $components, $existing = 'keep', $return_pages = false ) {
 
     // If no value is passed, there's nothing to do.
@@ -847 +850 @@
 
     $page_titles = bp_core_get_directory_page_default_titles();
+    if ( $return_pages ) {
+        // In this case the `$components` array uses Page titles as values.
+        $page_titles = bp_parse_args( $page_titles, $components );
+    }
 
     $pages_to_create = array();
@@ -899 +906 @@
     if ( ! bp_is_root_blog() ) {
         restore_current_blog();
+    }
+
+    if ( $return_pages ) {
+        return $pages;
     }
 }