Changeset 8683

Timestamp:

07/23/2014 08:43:51 PM (10 years ago)

Author:

imath

Message:

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 #5530

Location:

trunk/src

Files:

• bp-blogs/bp-blogs-template.php (modified) (1 diff)
• bp-core/deprecated/2.1.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/members/register.php (modified) (1 diff)

trunk/src/bp-blogs/bp-blogs-template.php

@@ -1044 +1044 @@
 
 /**
- * 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 );
-    }
-
-/**
  * Process a blog registration submission.
  *

trunk/src/bp-core/deprecated/2.1.php

@@ -571 +571 @@
 }
 add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
+
+/**
+ * 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();
+}

trunk/src/bp-members/bp-members-template.php

@@ -1574 +1574 @@
 
 /**
+ * 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 );
+    }
+
+/**
  * Output the 'signup_blog_titl' value submitted at signup.
  */

trunk/src/bp-templates/bp-legacy/buddypress/members/register.php

@@ -134 +134 @@
 
                         <?php if ( is_subdomain_install() ) : ?>
-                            http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> .<?php bp_blogs_subdomain_base(); ?>
+                            http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> .<?php bp_signup_subdomain_base(); ?>
                         <?php else : ?>
                             <?php echo home_url( '/' ); ?> <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" />