<!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][13502] trunk/src/bp-core: `buddypress` post type dynamic creation for `has_directory` components</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/13502">13502</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/13502","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-06-13 02:50:47 +0000 (Tue, 13 Jun 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'>`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 <a href="http://buddypress.trac.wordpress.org/ticket/8918">#8918</a>
See <a href="http://buddypress.trac.wordpress.org/ticket/4954">#4954</a>
Closes https://github.com/buddypress/buddypress/pull/116</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoreadminbpcoreadminfunctionsphp">trunk/src/bp-core/admin/bp-core-admin-functions.php</a></li>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoreadminbpcoreadminfunctionsphp"></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-functions.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-functions.php 2023-06-10 10:02:48 UTC (rev 13501)
+++ trunk/src/bp-core/admin/bp-core-admin-functions.php 2023-06-13 02:50:47 UTC (rev 13502)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,18 +290,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_page_components as $component ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $bp->pages->{$component['id']} ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orphaned_components[] = $component['name'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orphaned_components[ $component['id'] ] = $component['name'];
</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 class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $orphaned_components ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notice = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice_type = 'error';
+ $notice = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Translators: %s is the comma separated list of components needing a directory page.
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The following active BuddyPress Components do not have associated BuddyPress Pages: %s.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . implode( '</strong>, <strong>', array_map( 'esc_html', $orphaned_components ) ) . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_core_add_admin_notice( $notice );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</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"> // BP components cannot share a single WP page. Check for duplicate assignments, and post a message if found.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,13 +333,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there are duplicates, post a message about them.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $dupe_names ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notice = ssprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Translators: %s is the list of directory pages associated to more than one component.
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Each BuddyPress Component needs its own BuddyPress page. The following BuddyPress Pages have more than one component associated with them: %s.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . implode( '</strong>, <strong>', array_map( 'esc_html', $dupe_names ) ) . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_core_add_admin_notice( $notice );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_core_add_admin_notice( $notice, 'error' );
</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="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-06-10 10:02:48 UTC (rev 13501)
+++ trunk/src/bp-core/bp-core-functions.php 2023-06-13 02:50:47 UTC (rev 13502)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,13 +815,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * content (eg, the 'groups' page created by BP).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.7.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 12.0.0 Adds the `$return_pages` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_core_add_page_mappings( $components, $existing = 'keep' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_core_add_page_mappings( $components, $existing = 'keep', $return_pages = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no value is passed, there's nothing to do.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $components ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,6 +849,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"> $page_titles = bp_core_get_directory_page_default_titles();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $return_pages ) {
+ // In this case the `$components` array uses Page titles as values.
+ $page_titles = bp_parse_args( $page_titles, $components );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pages_to_create = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $components ) as $component_name ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -899,6 +906,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_is_root_blog() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</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 ( $return_pages ) {
+ return $pages;
+ }
</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>