Changeset 13778

Timestamp:

03/24/2024 07:47:58 AM (2 years ago)

Author:

imath

Message:

Improve the page / buddypress post types slugs unicity checks

To avoid slug conflicts between the page & buddypress post types as both URI Schemas put their slugs right after the site domain, 12.0.0 introduced a filter to extend the WordPress built-in check performed by wp_unique_post_slug().

This filter needed to be improve to :

• make sure to allow WordPress sub-pages to have the same slugs than the BP Directory ones as in this case the URI Schemas puts the parent page slug before the sub-page one.
• only request the page or buddypress post types having the same post_name than the page or buddypress post type being inserted.

Props ahegyes, emaralive

Fixes #9086 (branch 12.0)

Location:

branches/12.0

Files:

• src/bp-core/bp-core-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/admin/functions.php (modified) (1 diff)

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

@@ -999 +999 @@
  */
 function bp_core_set_unique_directory_page_slug( $slug = '', $post_ID = 0, $post_status = '', $post_type = '', $post_parent = 0, $original_slug = '' ) {
-    if ( ( 'buddypress' === $post_type || 'page' === $post_type ) && $slug === $original_slug ) {
+    if ( ( 'buddypress' === $post_type || 'page' === $post_type ) && $slug === $original_slug && ! $post_parent ) {
         $pages = get_posts(
             array(
@@ -1005 +1005 @@
                 'post_status'  => bp_core_get_directory_pages_stati(),
                 'post_type'    => array( 'buddypress', 'page' ),
+                'post_parent'  => 0,     // Only get a top level page.
+                'name'         => $slug, // Only get the same name page.
             )
         );

branches/12.0/tests/phpunit/testcases/admin/functions.php

@@ -245 +245 @@
         }
     }
+
+    public function is_active_filter( $is_active, $component ) {
+        if ( ! $is_active && 'attachments' === $component ) {
+            $is_active = true;
+        }
+
+        return $is_active;
+    }
+
+    /**
+     * @group bp_core_set_unique_directory_page_slug
+     * @ticket BP9086
+     */
+    public function test_bp_core_set_unique_directory_page_slug_for_newpage() {
+        $members_directory_id  = bp_core_get_directory_page_id( 'members' );
+        $directory_name        = get_post_field( 'post_name', $members_directory_id );
+        $page_id               = self::factory()->post->create(
+            array(
+                'post_type' => 'page',
+                'post_name' => 'members'
+            )
+        );
+
+        $page_name = get_post_field( 'post_name', $page_id );
+
+        $this->assertNotSame( $page_name, $directory_name );
+    }
+
+    /**
+     * @group bp_core_set_unique_directory_page_slug
+     * @ticket BP9086
+     */
+    public function test_bp_core_set_unique_directory_page_slug_for_newpage_having_parent() {
+        $members_directory_id = bp_core_get_directory_page_id( 'members' );
+        $directory_name       = get_post_field( 'post_name', $members_directory_id );
+        $parent               = self::factory()->post->create(
+            array(
+                'post_type'   => 'page',
+                'post_name'   => 'parent',
+            )
+        );
+        $page_id              = self::factory()->post->create(
+            array(
+                'post_type'   => 'page',
+                'post_name'   => 'members',
+                'post_parent' => $parent,
+            )
+        );
+
+        $page_name = get_post_field( 'post_name', $page_id );
+
+        $this->assertSame( $page_name, $directory_name );
+    }
+
+    /**
+     * @group bp_core_set_unique_directory_page_slug
+     * @ticket BP9086
+     */
+    public function test_bp_core_set_unique_directory_page_slug_for_newcomponent() {
+        self::factory()->post->create_many( 5, array( 'post_type' => 'page' ) );
+        $page_id = self::factory()->post->create(
+            array(
+                'post_type' => 'page',
+                'post_name' => 'bp-attachments',
+            )
+        );
+
+        $page_name          = get_post_field( 'post_name', $page_id );
+        $orphaned_component = array(
+            'attachments' => array(
+                'name'  => 'bp-attachments',
+                'title' => 'Community Media',
+            )
+        );
+
+        add_filter( 'bp_is_active', array( $this, 'is_active_filter' ), 10, 2 );
+
+        bp_core_add_page_mappings( $orphaned_component, 'keep', true );
+
+        $attachments_directory_id = bp_core_get_directory_page_id( 'attachments' );
+        $directory_name           = get_post_field( 'post_name', $attachments_directory_id );
+
+        $this->assertNotSame( $page_name, $directory_name );
+
+        remove_filter( 'bp_is_active', array( $this, 'is_active_filter' ), 10 );
+    }
+
+    /**
+     * @group bp_core_set_unique_directory_page_slug
+     * @ticket BP9086
+     */
+    public function test_bp_core_set_unique_directory_page_slug_having_parent_for_newcomponent() {
+        $parent  = self::factory()->post->create(
+            array(
+                'post_type'   => 'page',
+                'post_name'   => 'parent',
+            )
+        );
+        $page_id = self::factory()->post->create(
+            array(
+                'post_type'   => 'page',
+                'post_name'   => 'bp-attachments',
+                'post_parent' => $parent,
+            )
+        );
+
+        $page_name          = get_post_field( 'post_name', $page_id );
+        $orphaned_component = array(
+            'attachments' => array(
+                'name'  => 'bp-attachments',
+                'title' => 'Community Media',
+            )
+        );
+
+        add_filter( 'bp_is_active', array( $this, 'is_active_filter' ), 10, 2 );
+
+        bp_core_add_page_mappings( $orphaned_component, 'keep', true );
+
+        $attachments_directory_id = bp_core_get_directory_page_id( 'attachments' );
+        $directory_name           = get_post_field( 'post_name', $attachments_directory_id );
+
+        $this->assertSame( $page_name, $directory_name );
+
+        remove_filter( 'bp_is_active', array( $this, 'is_active_filter' ), 10 );
+    }
 }