<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3442] trunk: Make sure core components'
names get correctly added to the list of Banned Names in multisite.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3442</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-18 19:48:44 +0000 (Thu, 18 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure core components' names get correctly added to the list of Banned Names in multisite. (trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoresignupphp">trunk/bp-core/bp-core-signup.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-signup.php (3441 => 3442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-signup.php 2010-11-18 19:43:08 UTC (rev 3441)
+++ trunk/bp-core/bp-core-signup.php 2010-11-18 19:48:44 UTC (rev 3442)
</span><span class="lines">@@ -287,34 +287,45 @@
</span><span class="cx"> elseif ( is_string( $value ) )
</span><span class="cx"> $db_illegal_names = implode( ' ', $names );
</span><span class="cx">
</span><del>- // Add our slugs to the array and allow them to be filtered
- $filtered_illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
</del><ins>+ // Add the core components' slugs to the banned list even if their components aren't active.
+ $bp_component_slugs = array( 'groups', 'members', 'forums', 'blogs', 'activity', 'profile', 'friends', 'search', 'settings', 'register', 'activate' );
</ins><span class="cx">
</span><del>- if ( bp_is_active( 'activity' ) )
- $filtered_illegal_names[] = BP_ACTIVITY_SLUG;
</del><ins>+ if ( defined( 'BP_GROUPS_SLUG' ) )
+ $bp_component_slugs[] = BP_GROUPS_SLUG;
</ins><span class="cx">
</span><del>- if ( is_multisite() && bp_is_active( 'blogs' ) )
- $filtered_illegal_names[] = BP_BLOGS_SLUG;
</del><ins>+ if ( defined( 'BP_MEMBERS_SLUG' ) )
+ $bp_component_slugs[] = BP_MEMBERS_SLUG;
</ins><span class="cx">
</span><del>- if ( bp_is_active( 'forums' ) )
- $filtered_illegal_names[] = BP_FORUMS_SLUG;
</del><ins>+ if ( defined( 'BP_FORUMS_SLUG' ) )
+ $bp_component_slugs[] = BP_FORUMS_SLUG;
</ins><span class="cx">
</span><del>- if ( bp_is_active( 'friends' ) )
- $filtered_illegal_names[] = BP_FRIENDS_SLUG;
</del><ins>+ if ( defined( 'BP_BLOGS_SLUG' ) )
+ $bp_component_slugs[] = BP_BLOGS_SLUG;
</ins><span class="cx">
</span><del>- if ( bp_is_active( 'groups' ) )
- $filtered_illegal_names[] = BP_GROUPS_SLUG;
</del><ins>+ if ( defined( 'BP_ACTIVITY_SLUG' ) )
+ $bp_component_slugs[] = BP_ACTIVITY_SLUG;
</ins><span class="cx">
</span><del>- if ( bp_is_active( 'xprofile' ) )
- $filtered_illegal_names[] = BP_XPROFILE_SLUG;
</del><ins>+ if ( defined( 'BP_XPROFILE_SLUG' ) )
+ $bp_component_slugs[] = BP_XPROFILE_SLUG;
</ins><span class="cx">
</span><del>- $filtered_illegal_names[] = BP_ACTIVATION_SLUG;
- $filtered_illegal_names[] = BP_MEMBERS_SLUG;
- $filtered_illegal_names[] = BP_REGISTER_SLUG;
- $filtered_illegal_names[] = BP_SEARCH_SLUG;
- $filtered_illegal_names[] = BP_SETTINGS_SLUG;
- $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', $filtered_illegal_names );
</del><ins>+ if ( defined( 'BP_FRIENDS_SLUG' ) )
+ $bp_component_slugs[] = BP_FRIENDS_SLUG;
</ins><span class="cx">
</span><ins>+ 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;
+
+ // Add our slugs to the array and allow them to be filtered
+ $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
+
</ins><span class="cx"> // Merge the arrays together
</span><span class="cx"> $merged_names = array_merge( (array)$filtered_illegal_names, (array)$db_illegal_names );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (3441 => 3442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-11-18 19:43:08 UTC (rev 3441)
+++ trunk/bp-core.php 2010-11-18 19:48:44 UTC (rev 3442)
</span><span class="lines">@@ -1647,28 +1647,9 @@
</span><span class="cx"> * blog names on a subdirectory installation.
</span><span class="cx"> *
</span><span class="cx"> * For example, it would stop someone creating a blog with the slug "groups".
</span><del>- *
- * @package BuddyPress Core
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><span class="cx"> */
</span><span class="cx"> function bp_core_add_illegal_names() {
</span><del>- global $bp;
-
- $current = maybe_unserialize( get_site_option( 'illegal_names' ) );
- $bp_illegal_names = $bp->root_components;
-
- if ( is_array( $current ) ) {
- foreach( (array)$bp_illegal_names as $bp_illegal_name ) {
- if ( !in_array( $bp_illegal_name, $current ) )
- $current[] = $bp_illegal_name;
- }
- $new = $current;
- } else {
- $bp_illegal_names[] = $current;
- $new = $bp_illegal_names;
- }
-
- update_site_option( 'illegal_names', $new );
</del><ins>+ update_site_option( 'illegal_names', get_site_option( 'illegal_names' ), array() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>