Changeset 9468

Timestamp:

02/10/2015 12:24:27 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all references to bp_get_root_domain() . '/' . bp_get_blogs_root_slug() with bp_get_blogs_directory_permalink(), ensuring all usages and filters are applied uniformly. See #4954.

Location:

trunk/src

Files:

• bp-blogs/bp-blogs-template.php (modified) (3 diffs)
• bp-blogs/bp-blogs-widgets.php (modified) (1 diff)
• bp-core/deprecated/2.1.php (modified) (2 diffs)

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

@@ -1376 +1376 @@
 /**
  * Output a "Create a Site" link for users viewing their own profiles.
+ *
+ * This function is not used by BuddyPress as of 1.2, but is kept here for older
+ * themes that may still be using it.
  */
 function bp_create_blog_link() {
-    if ( bp_is_my_profile() )
-
-        /**
-         * Filters "Create a Site" links for users viewing their own profiles.
-         *
-         * @since BuddyPress (1.0.0)
-         *
-         * @param string $value HTML link for creating a site.
-         */
-        echo apply_filters( 'bp_create_blog_link', '<a href="' . bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create/">' . __( 'Create a Site', 'buddypress' ) . '</a>' );
+
+    // Don't show this link when not on your own profile
+    if ( ! bp_is_my_profile() ) {
+        return;
+    }
+
+    /**
+     * Filters "Create a Site" links for users viewing their own profiles.
+     *
+     * @since BuddyPress (1.0.0)
+     *
+     * @param string $value HTML link for creating a site.
+     */
+    echo apply_filters( 'bp_create_blog_link', '<a href="' . trailingslashit( bp_get_blogs_directory_permalink() . 'create' ) . '">' . __( 'Create a Site', 'buddypress' ) . '</a>' );
 }
 
@@ -1398 +1405 @@
 
     // Don't show these tabs on a user's own profile
-    if ( bp_is_my_profile() )
+    if ( bp_is_my_profile() ) {
         return false;
-
-    ?>
+    } ?>
 
     <ul class="content-header-nav">
@@ -1471 +1477 @@
             'link_title' => __( 'Create a Site', 'buddypress' ),
             'link_class' => 'blog-create no-ajax',
-            'link_href'  => trailingslashit( bp_get_root_domain() ) . trailingslashit( bp_get_blogs_root_slug() ) . trailingslashit( 'create' ),
+            'link_href'  => trailingslashit( bp_get_blogs_directory_permalink() . 'create' ),
             'wrapper'    => false,
             'block_self' => false,

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

@@ -51 +51 @@
 
         if ( ! empty( $instance['link_title'] ) ) {
-            $title = '<a href="' . trailingslashit( bp_get_root_domain() ) . trailingslashit( bp_get_blogs_root_slug() ) . '">' . esc_html( $title ) . '</a>';
+            $title = '<a href="' . bp_get_blogs_directory_permalink() . '">' . esc_html( $title ) . '</a>';
         }
 

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

@@ -144 +144 @@
         if ( bp_blog_signup_enabled() ) {
             echo '<li' . $alt . '>';
-            echo '<a href="' . bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create/">' . __( 'Create a Site!', 'buddypress' ) . '</a>';
+            echo '<a href="' . trailingslashit( bp_get_blogs_directory_permalink() . 'create' ) . '">' . __( 'Create a Site!', 'buddypress' ) . '</a>';
             echo '</li>';
         }
@@ -350 +350 @@
             <?php if ( is_multisite() && bp_is_active( 'blogs' ) ) : ?>
 
-                <li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '?random-blog' ?>"  rel="nofollow"><?php _e( 'Random Site', 'buddypress' ) ?></a></li>
+                <li><a href="<?php bp_blogs_directory_permalink(); ?>?random-blog"  rel="nofollow"><?php _e( 'Random Site', 'buddypress' ) ?></a></li>
 
             <?php endif; ?>