<!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][8684] trunk/src/bp-members/bp-members-filters.php: Avoid a conflict between member's profile url and member's blog url</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 { 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8684">8684</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-07-23 21:11:04 +0000 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid a conflict between member's profile url and member's blog url
When root profiles are enabled on a subdirectory multisite config, we need to make sure the member's profile url is different than the member's blog url. To do so the username needs to be an illegal blog name on this particular config.
fixes <a href="http://buddypress.trac.wordpress.org/ticket/5332">#5332</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmembersfiltersphp">trunk/src/bp-members/bp-members-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmembersfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-filters.php (8683 => 8684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-filters.php 2014-07-23 20:43:51 UTC (rev 8683)
+++ trunk/src/bp-members/bp-members-filters.php 2014-07-23 21:11:04 UTC (rev 8684)
</span><span class="lines">@@ -54,6 +54,43 @@
</span><span class="cx"> add_action( 'bp_loaded', 'bp_members_signup_sanitization' );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Make sure the username is not the blog slug in case of root profile & subdirectory blog
+ *
+ * If BP_ENABLE_ROOT_PROFILES is defined & multisite config is set to subdirectories,
+ * then there is a chance site.url/username == site.url/blogslug. If so, user's profile
+ * is not reachable, instead the blog is displayed. This filter makes sure the signup username
+ * is not the same than the blog slug for this particular config.
+ *
+ * @since BuddyPress (2.1.0)
+ * @param array $illegal_names
+ * @return array $illegal_names
+ */
+function bp_members_signup_with_subdirectory_blog( $illegal_names = array() ) {
+ if ( ! bp_core_enable_root_profiles() ) {
+ return $illegal_names;
+ }
+
+ if ( is_network_admin() && isset( $_POST['blog'] ) ) {
+ $blog = $_POST['blog'];
+ $domain = '';
+
+ if ( preg_match( '|^([a-zA-Z0-9-])$|', $blog['domain'] ) ) {
+ $domain = strtolower( $blog['domain'] );
+ }
+
+ if ( username_exists( $domain ) ) {
+ $illegal_names[] = $domain;
+ }
+
+ } else {
+ $illegal_names[] = buddypress()->signup->username;
+ }
+
+ return $illegal_names;
+}
+add_filter( 'subdirectory_reserved_names', 'bp_members_signup_with_subdirectory_blog', 10, 1 );
+
+/**
</ins><span class="cx"> * Filter the user profile URL to point to BuddyPress profile edit.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6.0)
</span></span></pre>
</div>
</div>
</body>
</html>