<!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][8683] trunk/src: Make sure to get the subdomain base on Multisite configs</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/8683">8683</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-07-23 20:43:51 +0000 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure to get the subdomain base on Multisite configs
Move the function to get the subdomain base out of the blogs component to be sure it will be retrieved (when registering a new blog) even if the blogs component is not active.
fixes <a href="http://buddypress.trac.wordpress.org/ticket/5530">#5530</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogstemplatephp">trunk/src/bp-blogs/bp-blogs-template.php</a></li>
<li><a href="#trunksrcbpcoredeprecated21php">trunk/src/bp-core/deprecated/2.1.php</a></li>
<li><a href="#trunksrcbpmembersbpmemberstemplatephp">trunk/src/bp-members/bp-members-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmembersregisterphp">trunk/src/bp-templates/bp-legacy/buddypress/members/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-blogs/bp-blogs-template.php (8682 => 8683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-blogs/bp-blogs-template.php 2014-07-23 19:42:14 UTC (rev 8682)
+++ trunk/src/bp-blogs/bp-blogs-template.php 2014-07-23 20:43:51 UTC (rev 8683)
</span><span class="lines">@@ -1043,27 +1043,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Output the base URL for subdomain installations of WordPress Multisite.
- *
- * @since BuddyPress (1.6.0)
- */
-function bp_blogs_subdomain_base() {
- echo bp_blogs_get_subdomain_base();
-}
- /**
- * Return the base URL for subdomain installations of WordPress Multisite.
- *
- * @since BuddyPress (1.6.0)
- *
- * @return string The base URL - eg, 'example.com' for site_url() example.com or www.example.com.
- */
- function bp_blogs_get_subdomain_base() {
- global $current_site;
-
- return apply_filters( 'bp_blogs_subdomain_base', preg_replace( '|^www\.|', '', $current_site->domain ) . $current_site->path );
- }
-
-/**
</del><span class="cx"> * Process a blog registration submission.
</span><span class="cx"> *
</span><span class="cx"> * Passes submitted values to {@link wpmu_create_blog()}.
</span></span></pre></div>
<a id="trunksrcbpcoredeprecated21php"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/deprecated/2.1.php (8682 => 8683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/deprecated/2.1.php 2014-07-23 19:42:14 UTC (rev 8682)
+++ trunk/src/bp-core/deprecated/2.1.php 2014-07-23 20:43:51 UTC (rev 8683)
</span><span class="lines">@@ -570,3 +570,29 @@
</span><span class="cx"> echo '</li>';
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
</span><ins>+
+/**
+ * Output the base URL for subdomain installations of WordPress Multisite.
+ *
+ * @since BuddyPress (1.6.0)
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_blogs_subdomain_base() {
+ _deprecated_function( __FUNCTION__, '2.1', 'bp_signup_subdomain_base()' );
+ echo bp_signup_get_subdomain_base();
+}
+
+/**
+ * Return the base URL for subdomain installations of WordPress Multisite.
+ *
+ * @since BuddyPress (1.6.0)
+ *
+ * @return string The base URL - eg, 'example.com' for site_url() example.com or www.example.com.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_blogs_get_subdomain_base() {
+ _deprecated_function( __FUNCTION__, '2.1', 'bp_signup_get_subdomain_base()' );
+ return bp_signup_get_subdomain_base();
+}
</ins></span></pre></div>
<a id="trunksrcbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-template.php (8682 => 8683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-template.php 2014-07-23 19:42:14 UTC (rev 8682)
+++ trunk/src/bp-members/bp-members-template.php 2014-07-23 20:43:51 UTC (rev 8683)
</span><span class="lines">@@ -1573,6 +1573,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Output the base URL for subdomain installations of WordPress Multisite.
+ *
+ * @since BuddyPress (2.1.0)
+ */
+function bp_signup_subdomain_base() {
+ echo bp_signup_get_subdomain_base();
+}
+ /**
+ * Return the base URL for subdomain installations of WordPress Multisite.
+ *
+ * Replaces bp_blogs_get_subdomain_base()
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @return string The base URL - eg, 'example.com' for site_url() example.com or www.example.com.
+ */
+ function bp_signup_get_subdomain_base() {
+ global $current_site;
+
+ // In case plugins are still using this filter
+ $subdomain_base = apply_filters( 'bp_blogs_subdomain_base', preg_replace( '|^www\.|', '', $current_site->domain ) . $current_site->path );
+
+ return apply_filters( 'bp_signup_subdomain_base', $subdomain_base );
+ }
+
+/**
</ins><span class="cx"> * Output the 'signup_blog_titl' value submitted at signup.
</span><span class="cx"> */
</span><span class="cx"> function bp_signup_blog_title_value() {
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressmembersregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/register.php (8682 => 8683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/members/register.php 2014-07-23 19:42:14 UTC (rev 8682)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/register.php 2014-07-23 20:43:51 UTC (rev 8683)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> <?php do_action( 'bp_signup_blog_url_errors' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_subdomain_install() ) : ?>
</span><del>- http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> .<?php bp_blogs_subdomain_base(); ?>
</del><ins>+ http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> .<?php bp_signup_subdomain_base(); ?>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx"> <?php echo home_url( '/' ); ?> <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" />
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>