<!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][13678] trunk/src/bp-core: Make sure slugs are customizable for the BP root site</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/13678">13678</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/13678","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>2023-12-24 04:21:16 +0000 (Sun, 24 Dec 2023)</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 slugs are customizable for the BP root site
On multisite configs the BP root site can be different than the current WordPress site. It's necessary to eventually switch to the BP root site before saving custom slugs or retrieving them.
Props perchenet
See <a href="http://buddypress.trac.wordpress.org/ticket/9048">#9048</a> (trunk)
Closes https://github.com/buddypress/buddypress/pull/206</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoreadminbpcoreadminrewritesphp">trunk/src/bp-core/admin/bp-core-admin-rewrites.php</a></li>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpcorebpcorerewritesphp">trunk/src/bp-core/bp-core-rewrites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoreadminbpcoreadminrewritesphp"></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/admin/bp-core-admin-rewrites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/admin/bp-core-admin-rewrites.php 2023-12-20 12:34:01 UTC (rev 13677)
+++ trunk/src/bp-core/admin/bp-core-admin-rewrites.php 2023-12-24 04:21:16 UTC (rev 13678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'error', 'true', $base_url ) );
</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">+ $switched_to_root_blog = false;
+
+ // Make sure the current blog is set to the root blog.
+ if ( ! bp_is_root_blog() ) {
+ switch_to_blog( bp_get_root_blog_id() );
+ $switched_to_root_blog = true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $directory_pages = (array) bp_core_get_directory_pages();
</span><span class="cx" style="display: block; padding: 0 10px"> $current_page_slugs = wp_list_pluck( $directory_pages, 'slug', 'id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_page_titles = wp_list_pluck( $directory_pages, 'title', 'id' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,6 +105,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp_delete_rewrite_rules();
</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 ( $switched_to_root_blog ) {
+ restore_current_blog();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'updated', 'true', $base_url ) );
</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="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 2023-12-20 12:34:01 UTC (rev 13677)
+++ trunk/src/bp-core/bp-core-functions.php 2023-12-24 04:21:16 UTC (rev 13678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,8 +775,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $pages ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set pages as standard class.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pages = new stdClass;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pages = new stdClass;
+ $switched_to_root_blog = 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 the current blog is set to the root blog.
+ if ( ! bp_is_root_blog() && ! bp_is_multiblog_mode() ) {
+ switch_to_blog( bp_get_root_blog_id() );
+ $switched_to_root_blog = true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get pages and IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> $page_ids = bp_core_get_directory_page_ids();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $page_ids ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -817,6 +824,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 ( $switched_to_root_blog ) {
+ restore_current_blog();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'directory_pages', $pages, 'bp_pages' );
</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="trunksrcbpcorebpcorerewritesphp"></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-rewrites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-rewrites.php 2023-12-20 12:34:01 UTC (rev 13677)
+++ trunk/src/bp-core/bp-core-rewrites.php 2023-12-24 04:21:16 UTC (rev 13678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 12.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_delete_rewrite_rules() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_option( 'rewrite_rules' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_delete_option( 'rewrite_rules' );
</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>
</div>
</body>
</html>