<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13778] branches/12.0: Improve the `page` / `buddypress` post types slugs unicity checks</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13778">13778</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13778","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-03-24 07:47:58 +0000 (Sun, 24 Mar 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/9086">#9086</a> (branch 12.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches120srcbpcorebpcorefunctionsphp">branches/12.0/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#branches120testsphpunittestcasesadminfunctionsphp">branches/12.0/tests/phpunit/testcases/admin/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches120srcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/12.0/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/12.0/src/bp-core/bp-core-functions.php 2024-03-24 07:39:16 UTC (rev 13777)
+++ branches/12.0/src/bp-core/bp-core-functions.php 2024-03-24 07:47:58 UTC (rev 13778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,12 +998,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $original_slug The original post slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_core_set_unique_directory_page_slug( $slug = '', $post_ID = 0, $post_status = '', $post_type = '', $post_parent = 0, $original_slug = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 'buddypress' === $post_type || 'page' === $post_type ) && $slug === $original_slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'buddypress' === $post_type || 'page' === $post_type ) && $slug === $original_slug && ! $post_parent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pages = get_posts(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post__not_in' => array( $post_ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => bp_core_get_directory_pages_stati(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => array( 'buddypress', 'page' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_parent' => 0, // Only get a top level page.
+ 'name' => $slug, // Only get the same name page.
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches120testsphpunittestcasesadminfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/12.0/tests/phpunit/testcases/admin/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/12.0/tests/phpunit/testcases/admin/functions.php 2024-03-24 07:39:16 UTC (rev 13777)
+++ branches/12.0/tests/phpunit/testcases/admin/functions.php 2024-03-24 07:47:58 UTC (rev 13778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,4 +244,129 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $correct_description, $d_term->description );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>