Changeset 4651

Timestamp:

07/12/2011 03:14:14 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Audit the usage of $bp->blogs->slug and $bp->blogs->root_slug. See #3325.

Location:

trunk

Files:

• bp-blogs/bp-blogs-buddybar.php (modified) (2 diffs)
• bp-blogs/bp-blogs-functions.php (modified) (2 diffs)
• bp-blogs/bp-blogs-template.php (modified) (2 diffs)
• bp-core/bp-core-buddybar.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (1 diff)

trunk/bp-blogs/bp-blogs-buddybar.php

@@ -19 +19 @@
     if ( is_array( $blogs['blogs'] ) && (int)$blogs['count'] ) {
 
-        echo '<li id="bp-adminbar-blogs-menu"><a href="' . trailingslashit( $bp->loggedin_user->domain . $bp->blogs->slug ) . '">';
+        echo '<li id="bp-adminbar-blogs-menu"><a href="' . trailingslashit( $bp->loggedin_user->domain . bp_get_blogs_slug() ) . '">';
 
         _e( 'My Sites', 'buddypress' );
@@ -49 +49 @@
         if ( bp_blog_signup_enabled() ) {
             echo '<li' . $alt . '>';
-            echo '<a href="' . bp_get_root_domain() . '/' . $bp->blogs->root_slug . '/create/">' . __( 'Create a Site!', 'buddypress' ) . '</a>';
+            echo '<a href="' . bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create/">' . __( 'Create a Site!', 'buddypress' ) . '</a>';
             echo '</li>';
         }

trunk/bp-blogs/bp-blogs-functions.php

@@ -371 +371 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $post_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog_post' ) );
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $post_id, 'component' => $bp->blogs->id, 'type' => 'new_blog_post' ) );
 
     do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $user_id );
@@ -419 +419 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component' => $bp->blogs->slug, 'type' => false ) );
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component' => $bp->blogs->id, 'type' => false ) );
 
     do_action( 'bp_blogs_remove_data_for_blog', $blog_id );

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

@@ -536 +536 @@
 
     if ( bp_is_my_profile() )
-        echo apply_filters( 'bp_create_blog_link', '<a href="' . bp_get_root_domain() . '/' . $bp->blogs->root_slug . '/create/">' . __( 'Create a Site', 'buddypress' ) . '</a>' );
+        echo apply_filters( 'bp_create_blog_link', '<a href="' . bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create/">' . __( 'Create a Site', 'buddypress' ) . '</a>' );
 }
 
@@ -546 +546 @@
         return false;
 
-    $current_tab = $bp->current_action; ?>
+    ?>
 
     <ul class="content-header-nav">
-        <li<?php if ( 'my-blogs' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . $bp->blogs->slug . '/my-blogs' ); ?>"><?php printf( __( "%s's Sites", 'buddypress' ), $bp->displayed_user->fullname ); ?></a></li>
-        <li<?php if ( 'recent-posts' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . $bp->blogs->slug . '/recent-posts' ); ?>"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname ); ?></a></li>
-        <li<?php if ( 'recent-comments' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . $bp->blogs->slug . '/recent-comments' );?>"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname ); ?></a></li>
+        <li<?php if ( bp_is_current_action( 'my-blogs'        ) || !bp_current_action() ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_displayed_user_domain() . bp_get_blogs_slug() . '/my-blogs'        ); ?>"><?php printf( __( "%s's Sites", 'buddypress' ),           bp_get_displayed_user_fullname() ); ?></a></li>
+        <li<?php if ( bp_is_current_action( 'recent-posts'    )                         ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_displayed_user_domain() . bp_get_blogs_slug() . '/recent-posts'    ); ?>"><?php printf( __( "%s's Recent Posts", 'buddypress' ),    bp_get_displayed_user_fullname() ); ?></a></li>
+        <li<?php if ( bp_is_current_action( 'recent-comments' )                         ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_displayed_user_domain() . bp_get_blogs_slug() . '/recent-comments' ); ?>"><?php printf( __( "%s's Recent Comments", 'buddypress' ), bp_get_displayed_user_fullname() ); ?></a></li>
     </ul>
 

trunk/bp-core/bp-core-buddybar.php

@@ -488 +488 @@
             <?php if ( is_multisite() && bp_is_active( 'blogs' ) ) : ?>
 
-                <li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . $bp->blogs->root_slug ) . '?random-blog' ?>"  rel="nofollow"><?php _e( 'Random Site', 'buddypress' ) ?></a></li>
+                <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>
 
             <?php endif; ?>

trunk/bp-core/bp-core-functions.php

@@ -828 +828 @@
 
             case 'blogs':
-                $slug = bp_is_active( 'blogs' )  ? $bp->blogs->root_slug  : '';
+                $slug = bp_is_active( 'blogs' )  ? bp_get_blogs_root_slug()  : '';
                 break;