<!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][14050] branches/14.0/src: Resolve Multiple Issues with the BuddyPress Constants panel</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/14050">14050</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/14050","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-10-22 02:16:15 +0000 (Tue, 22 Oct 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'>Resolve Multiple Issues with the BuddyPress Constants panel
- Make sure the `BP_XPROFILE_BASE_GROUP_NAME` & `BP_XPROFILE_FULLNAME_FIELD_NAME` are defined before using them
- Use the right option name to set the `BP_XPROFILE_BASE_GROUP_NAME`
- Include `BP_EMBED_DISABLE_ACTIVITY` into the BuddyPress Constants panel
- Remove the deprecated mention from `BP_FORUMS_PARENT_FORUM_ID`, `BP_FORUMS_SLUG` & `BP_SEARCH_SLUG` constants.
Props emaralive
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9245">#9245</a> (branch 14.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches140srcbpcoreadminbpcoreadmintoolsphp">branches/14.0/src/bp-core/admin/bp-core-admin-tools.php</a></li>
<li><a href="#branches140srcbpxprofileclassesclassbpxprofilecomponentphp">branches/14.0/src/bp-xprofile/classes/class-bp-xprofile-component.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches140srcbpcoreadminbpcoreadmintoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/14.0/src/bp-core/admin/bp-core-admin-tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/14.0/src/bp-core/admin/bp-core-admin-tools.php 2024-10-22 02:11:10 UTC (rev 14049)
+++ branches/14.0/src/bp-core/admin/bp-core-admin-tools.php 2024-10-22 02:16:15 UTC (rev 14050)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -941,11 +941,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_XPROFILE_BASE_GROUP_NAME' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_XPROFILE_BASE_GROUP_NAME',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => BP_XPROFILE_BASE_GROUP_NAME,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => defined( 'BP_XPROFILE_BASE_GROUP_NAME' ) ? BP_XPROFILE_BASE_GROUP_NAME : __( 'Undefined', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_XPROFILE_FULLNAME_FIELD_NAME' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_XPROFILE_FULLNAME_FIELD_NAME',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => BP_XPROFILE_FULLNAME_FIELD_NAME,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) ? BP_XPROFILE_FULLNAME_FIELD_NAME : __( 'Undefined', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_MESSAGES_AUTOCOMPLETE_ALL' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_MESSAGES_AUTOCOMPLETE_ALL',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -961,11 +961,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : __( 'Undefined', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'debug' => defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'undefined',
</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_SIGNUPS_SKIP_USER_CREATION' => array(
- 'label' => 'BP_SIGNUPS_SKIP_USER_CREATION (deprecated)',
- 'value' => defined( 'BP_SIGNUPS_SKIP_USER_CREATION' ) && BP_SIGNUPS_SKIP_USER_CREATION ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
- 'debug' => defined( 'BP_SIGNUPS_SKIP_USER_CREATION' ) ? BP_SIGNUPS_SKIP_USER_CREATION : 'undefined',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'BP_MEMBERS_REQUIRED_PASSWORD_STRENGTH' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_MEMBERS_REQUIRED_PASSWORD_STRENGTH',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_MEMBERS_REQUIRED_PASSWORD_STRENGTH' ) ? BP_MEMBERS_REQUIRED_PASSWORD_STRENGTH : __( 'Undefined', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,6 +971,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_EMBED_DISABLE_PRIVATE_MESSAGES' ) ? BP_EMBED_DISABLE_PRIVATE_MESSAGES : __( 'Undefined', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'debug' => defined( 'BP_EMBED_DISABLE_PRIVATE_MESSAGES' ) ? BP_EMBED_DISABLE_PRIVATE_MESSAGES : 'undefined',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BP_EMBED_DISABLE_ACTIVITY' => array(
+ 'label' => 'BP_EMBED_DISABLE_ACTIVITY',
+ 'value' => defined( 'BP_EMBED_DISABLE_ACTIVITY' ) ? BP_EMBED_DISABLE_ACTIVITY : __( 'Undefined', 'buddypress' ),
+ 'debug' => defined( 'BP_EMBED_DISABLE_ACTIVITY' ) ? BP_EMBED_DISABLE_ACTIVITY : 'undefined',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'BP_EMBED_DISABLE_ACTIVITY_REPLIES' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_EMBED_DISABLE_ACTIVITY_REPLIES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_EMBED_DISABLE_ACTIVITY_REPLIES' ) ? BP_EMBED_DISABLE_ACTIVITY_REPLIES : __( 'Undefined', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1036,6 +1036,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_AVATAR_THUMB_WIDTH',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => BP_AVATAR_THUMB_WIDTH,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BP_FORUMS_PARENT_FORUM_ID' => array(
+ 'label' => 'BP_FORUMS_PARENT_FORUM_ID',
+ 'value' => defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ? BP_FORUMS_PARENT_FORUM_ID : __( 'Undefined', 'buddypress' ),
+ 'debug' => defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ? BP_FORUMS_PARENT_FORUM_ID : 'undefined',
+ ),
+ 'BP_FORUMS_SLUG' => array(
+ 'label' => 'BP_FORUMS_SLUG',
+ 'value' => defined( 'BP_FORUMS_SLUG' ) ? BP_FORUMS_SLUG : __( 'Undefined', 'buddypress' ),
+ 'debug' => defined( 'BP_FORUMS_SLUG' ) ? BP_FORUMS_SLUG : 'undefined',
+ ),
+ 'BP_SEARCH_SLUG' => array(
+ 'label' => 'BP_SEARCH_SLUG',
+ 'value' => defined( 'BP_SEARCH_SLUG' ) ? BP_SEARCH_SLUG : __( 'Undefined', 'buddypress' ),
+ 'debug' => defined( 'BP_SEARCH_SLUG' ) ? BP_SEARCH_SLUG : 'undefined',
+ ),
+ 'BP_SIGNUPS_SKIP_USER_CREATION' => array(
+ 'label' => 'BP_SIGNUPS_SKIP_USER_CREATION (deprecated)',
+ 'value' => defined( 'BP_SIGNUPS_SKIP_USER_CREATION' ) && BP_SIGNUPS_SKIP_USER_CREATION ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
+ 'debug' => defined( 'BP_SIGNUPS_SKIP_USER_CREATION' ) ? BP_SIGNUPS_SKIP_USER_CREATION : 'undefined',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'BP_USE_WP_ADMIN_BAR' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_USE_WP_ADMIN_BAR (deprecated)',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_USE_WP_ADMIN_BAR' ) ? BP_USE_WP_ADMIN_BAR : __( 'Undefined', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1046,11 +1066,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_FRIENDS_DB_VERSION' ) ? BP_FRIENDS_DB_VERSION : __( 'Undefined', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'debug' => defined( 'BP_FRIENDS_DB_VERSION' ) ? BP_FRIENDS_DB_VERSION : 'undefined',
</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_FORUMS_PARENT_FORUM_ID' => array(
- 'label' => 'BP_FORUMS_PARENT_FORUM_ID (deprecated)',
- 'value' => defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ? BP_FORUMS_PARENT_FORUM_ID : __( 'Undefined', 'buddypress' ),
- 'debug' => defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ? BP_FORUMS_PARENT_FORUM_ID : 'undefined',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'BP_MEMBERS_SLUG' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'BP_MEMBERS_SLUG (deprecated)',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_MEMBERS_SLUG' ) ? BP_MEMBERS_SLUG : __( 'Undefined', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,16 +1111,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => defined( 'BP_XPROFILE_SLUG' ) ? BP_XPROFILE_SLUG : __( 'Undefined', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'debug' => defined( 'BP_XPROFILE_SLUG' ) ? BP_XPROFILE_SLUG : 'undefined',
</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_FORUMS_SLUG' => array(
- 'label' => 'BP_FORUMS_SLUG (deprecated)',
- 'value' => defined( 'BP_FORUMS_SLUG' ) ? BP_FORUMS_SLUG : __( 'Undefined', 'buddypress' ),
- 'debug' => defined( 'BP_FORUMS_SLUG' ) ? BP_FORUMS_SLUG : 'undefined',
- ),
- 'BP_SEARCH_SLUG' => array(
- 'label' => 'BP_SEARCH_SLUG (deprecated)',
- 'value' => defined( 'BP_SEARCH_SLUG' ) ? BP_SEARCH_SLUG : __( 'Undefined', 'buddypress' ),
- 'debug' => defined( 'BP_SEARCH_SLUG' ) ? BP_SEARCH_SLUG : 'undefined',
- ),
</del><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="branches140srcbpxprofileclassesclassbpxprofilecomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/14.0/src/bp-xprofile/classes/class-bp-xprofile-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/14.0/src/bp-xprofile/classes/class-bp-xprofile-component.php 2024-10-22 02:11:10 UTC (rev 14049)
+++ branches/14.0/src/bp-xprofile/classes/class-bp-xprofile-component.php 2024-10-22 02:16:15 UTC (rev 14050)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // to use in SQL statements.
</span><span class="cx" style="display: block; padding: 0 10px"> // Defined conditionally to accommodate unit tests.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'BP_XPROFILE_BASE_GROUP_NAME' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'BP_XPROFILE_BASE_GROUP_NAME', stripslashes( bp_core_get_root_option( 'avatar_default' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'BP_XPROFILE_BASE_GROUP_NAME', stripslashes( bp_core_get_root_option( 'bp-xprofile-base-group-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"> if ( ! defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>