<!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][3794] trunk: Clean up illegal-names constants check.</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 { 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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd>3794</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-21 11:26:13 +0000 (Fri, 21 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up illegal-names constants check. Swap out BP_XPROFILE_SLUG for $bp global equivalent</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpusersbpuserssignupphp">trunk/bp-users/bp-users-signup.php</a></li>
<li><a href="#trunkbpxprofilebpxprofiletemplatephp">trunk/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpusersbpuserssignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-users/bp-users-signup.php (3793 => 3794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-users/bp-users-signup.php 2011-01-21 11:14:15 UTC (rev 3793)
+++ trunk/bp-users/bp-users-signup.php 2011-01-21 11:26:13 UTC (rev 3794)
</span><span class="lines">@@ -229,49 +229,46 @@
</span><span class="cx"> $db_illegal_names = implode( ' ', $names );
</span><span class="cx">
</span><span class="cx"> // Add the core components' slugs to the banned list even if their components aren't active.
</span><del>- $bp_component_slugs = array( 'groups', 'members', 'forums', 'blogs', 'activity', 'profile', 'friends', 'search', 'settings', 'register', 'activate' );
</del><ins>+ $bp_component_slugs = array(
+ 'groups',
+ 'members',
+ 'forums',
+ 'blogs',
+ 'activity',
+ 'profile',
+ 'friends',
+ 'search',
+ 'settings',
+ 'register',
+ 'activate'
+ );
</ins><span class="cx">
</span><del>- if ( defined( 'BP_GROUPS_SLUG' ) )
- $bp_component_slugs[] = BP_GROUPS_SLUG;
</del><ins>+ // Core constants
+ $slug_constants = array(
+ 'BP_GROUPS_SLUG',
+ 'BP_MEMBERS_SLUG',
+ 'BP_FORUMS_SLUG',
+ 'BP_BLOGS_SLUG',
+ 'BP_ACTIVITY_SLUG',
+ 'BP_XPROFILE_SLUG',
+ 'BP_FRIENDS_SLUG',
+ 'BP_SEARCH_SLUG',
+ 'BP_SETTINGS_SLUG',
+ 'BP_REGISTER_SLUG',
+ 'BP_ACTIVATION_SLUG',
+ );
+ foreach( $slug_constants as $constant )
+ if ( defined( $constant ) )
+ $bp_component_slugs[] = constant( $constant );
</ins><span class="cx">
</span><del>- if ( defined( 'BP_MEMBERS_SLUG' ) )
- $bp_component_slugs[] = BP_MEMBERS_SLUG;
-
- if ( defined( 'BP_FORUMS_SLUG' ) )
- $bp_component_slugs[] = BP_FORUMS_SLUG;
-
- if ( defined( 'BP_BLOGS_SLUG' ) )
- $bp_component_slugs[] = BP_BLOGS_SLUG;
-
- if ( defined( 'BP_ACTIVITY_SLUG' ) )
- $bp_component_slugs[] = BP_ACTIVITY_SLUG;
-
- if ( defined( 'BP_XPROFILE_SLUG' ) )
- $bp_component_slugs[] = BP_XPROFILE_SLUG;
-
- if ( defined( 'BP_FRIENDS_SLUG' ) )
- $bp_component_slugs[] = BP_FRIENDS_SLUG;
-
- if ( defined( 'BP_SEARCH_SLUG' ) )
- $bp_component_slugs[] = BP_SEARCH_SLUG;
-
- if ( defined( 'BP_SETTINGS_SLUG' ) )
- $bp_component_slugs[] = BP_SETTINGS_SLUG;
-
- if ( defined( 'BP_REGISTER_SLUG' ) )
- $bp_component_slugs[] = BP_REGISTER_SLUG;
-
- if ( defined( 'BP_ACTIVATION_SLUG' ) )
- $bp_component_slugs[] = BP_ACTIVATION_SLUG;
-
</del><span class="cx"> // Add our slugs to the array and allow them to be filtered
</span><span class="cx"> $filtered_illegal_names = apply_filters( 'bp_users_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
</span><span class="cx">
</span><span class="cx"> // Merge the arrays together
</span><del>- $merged_names = array_merge( (array)$filtered_illegal_names, (array)$db_illegal_names );
</del><ins>+ $merged_names = array_merge( (array)$filtered_illegal_names, (array)$db_illegal_names );
</ins><span class="cx">
</span><span class="cx"> // Remove duplicates
</span><del>- $illegal_names = array_unique( (array)$merged_names );
</del><ins>+ $illegal_names = array_unique( (array)$merged_names );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_users_illegal_names', $illegal_names );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-template.php (3793 => 3794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-template.php 2011-01-21 11:14:15 UTC (rev 3793)
+++ trunk/bp-xprofile/bp-xprofile-template.php 2011-01-21 11:26:13 UTC (rev 3794)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> function bp_get_the_profile_group_edit_form_action() {
</span><span class="cx"> global $bp, $group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_the_profile_group_edit_form_action', $bp->displayed_user->domain . BP_XPROFILE_SLUG . '/edit/group/' . $group->id . '/' );
</del><ins>+ return apply_filters( 'bp_get_the_profile_group_edit_form_action', $bp->displayed_user->domain . $bp->profile->slug . '/edit/group/' . $group->id . '/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_profile_group_field_ids() {
</span></span></pre>
</div>
</div>
</body>
</html>