<!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][13159] trunk: Make sure BP directory page IDs are not wrongly unset on multisite</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/13159">13159</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/13159","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>2021-12-04 14:53:34 +0000 (Sat, 04 Dec 2021)</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'>Make sure BP directory page IDs are not wrongly unset on multisite
In case a post of a different site of the multisite network has the same ID than one of the BP directory page IDs, the function can wrongly return an array in which the corresponding directory page ID is missing.
We need to make sure this function always run into the BP Root Blog context.
Props thomaslhotta
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8592">#8592</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasescorefunctionsbpCoreGetDirectoryPageIdsphp">trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2021-11-30 20:29:59 UTC (rev 13158)
+++ trunk/src/bp-core/bp-core-functions.php 2021-12-04 14:53:34 UTC (rev 13159)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,6 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fetch a list of BP directory pages from the appropriate meta table.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 10.0.0 Eventually switch the current site to BP root's one on multisite configs.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $status 'active' to return only pages associated with active components, 'all' to return all saved
</span><span class="cx" style="display: block; padding: 0 10px"> * pages. When running save routines, use 'all' to avoid removing data related to inactive
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +512,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_core_get_directory_page_ids( $status = 'active' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = bp_get_option( 'bp-pages', array() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $switched = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Make sure to switch the current site to BP root's one, if needed.
+ *
+ * @see https://buddypress.trac.wordpress.org/ticket/8592
+ */
+ if ( is_multisite() ) {
+ $bp_site_id = bp_get_root_blog_id();
+
+ if ( $bp_site_id !== get_current_blog_id() ) {
+ switch_to_blog( $bp_site_id );
+ $switched = true;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Loop through pages.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $page_ids as $component_name => $page_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,6 +552,10 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === $switched ) {
+ restore_current_blog();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the list of BP directory pages from the appropriate meta table.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorefunctionsbpCoreGetDirectoryPageIdsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php 2021-11-30 20:29:59 UTC (rev 13158)
+++ trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php 2021-12-04 14:53:34 UTC (rev 13159)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,6 +285,46 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket BP8592
+ */
+ public function test_bp_core_get_directory_pages_ids_ms_non_root_blog_trashed_same_page_id() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped();
+ }
+
+ // create a blog
+ $u = self::factory()->user->create();
+ $b1 = self::factory()->blog->create(
+ array(
+ 'user_id' => $u,
+ )
+ );
+
+ // Switch to blog and create a post with the same BP Members page ID.
+ switch_to_blog( $b1 );
+
+ $dir_page_ids = bp_core_get_directory_page_ids();
+
+ $p = self::factory()->post->create(
+ array(
+ 'import_id' => $dir_page_ids['members'],
+ )
+ );
+
+ // Trash the post that matches the BP Members page ID on this sub-site
+ wp_trash_post( $dir_page_ids['members'] );
+
+ // refetch BP directory page IDs
+ $page_ids = bp_core_get_directory_page_ids();
+
+ // restore blog
+ restore_current_blog();
+
+ // Now verify that our BP Members page was not wiped out
+ $this->assertTrue( $dir_page_ids['members'] === $page_ids['members'] );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket BP7193
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_core_get_directory_pages_autocreate_register_pages_single_site() {
</span></span></pre>
</div>
</div>
</body>
</html>