Ticket #5530: 5530.diff

bp-blogs/bp-blogs-template.php

@@ -1007 +1007 @@
 }
 
 /**
- * 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.
  *
  * Passes submitted values to {@link wpmu_create_blog()}.

bp-core/deprecated/2.0.php

@@ -30 +30 @@
 function bp_messages_screen_inbox_mark_notifications() {
         _deprecated_function( __FUNCTION__, '2.0', 'bp_messages_screen_conversation_mark_notifications()' );
 }
+
+/**
+ * @deprecated BuddyPress (2.0.0)
+ */
+function bp_blogs_subdomain_base() {
+        _deprecated_function( __FUNCTION__, '2.0', 'bp_signup_subdomain_base()' );
+        echo bp_signup_get_subdomain_base();
+}
+
+/**
+ * @deprecated BuddyPress (2.0.0)
+ */
+function bp_blogs_get_subdomain_base() {
+        _deprecated_function( __FUNCTION__, '2.0', 'bp_signup_get_subdomain_base()' );
+        return bp_signup_get_subdomain_base();
+}

bp-members/bp-members-template.php

@@ -1143 +1143 @@
                 return apply_filters( 'bp_get_signup_blog_url_value', $value );
         }
 
+/**
+ * Output the base URL for subdomain installations of WordPress Multisite.
+ *
+ * @since BuddyPress (2.0.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.0.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 );
+        }
+
 function bp_signup_blog_title_value() {
         echo bp_get_signup_blog_title_value();
 }

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

@@ -133 +133 @@
                                                 <?php do_action( 'bp_signup_blog_url_errors' ); ?>
 
                                                 <?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(); ?>" />
                                                 <?php endif; ?>

bp-themes/bp-default/registration/register.php

@@ -217 +217 @@
                                                         <?php do_action( 'bp_signup_blog_url_errors' ); ?>
 
                                                         <?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(); ?>" />
                                                         <?php endif; ?>