Changeset 2168 for trunk/bp-blogs.php

Timestamp:

12/14/2009 03:24:05 PM (17 years ago)

Author:

apeatling

Message:

Committing core code support for new default theme.

Removed all deprecated code since it will be released as a separate plugin for backwards compatibility if people need it.

Removed the wire and status updates components since there is no support in the theme for these. If people still want this functionality then I'm sure there is someone in the community that could spend a bit of time and release them as plugins. I'm happy to guide.

Removed a lot of template loop duplication. There are no longer site loops and user loops (e.g. bp_has_site_groups() / bp_has_groups() ). There are now bp_has_members(), bp_has_groups(), bp_has_blogs() and you can pass a "user_id" parameter into these loops to limit results to only that user or users.

Merged activity stream functions. There are no longer functions for bp_activity_get_sitewide() / bp_activity_get_for_user() / bp_activity_get_friends_activity() instead there is simply one function: bp_activity_get() and you can pass in parameters to filter on just friends, for a single user, or anything your heart desires. Actually, filtering is extremely fine grained, so I encourage devs to check out the filter functions.

Lots of other code cleanup.

The new default theme will be committed straight after this. The original default folder will be renamed to bp-classic.

File:

• trunk/bp-blogs.php (modified) (7 diffs)

trunk/bp-blogs.php

@@ -10 +10 @@
 require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-templatetags.php' );
 require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-widgets.php' );
-
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-        require ( BP_PLUGIN_DIR . '/bp-blogs/deprecated/bp-blogs-deprecated.php' );
 
 function bp_blogs_install() {
@@ -145 +141 @@
 
         /* Add 'Blogs' to the main navigation */
-        bp_core_new_nav_item( array( 'name' => __( 'Blogs', 'buddypress' ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
+        bp_core_new_nav_item( array( 'name' => sprintf( __( 'Blogs (%d)', 'buddypress' ), bp_blogs_total_blogs_for_user() ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
 
         $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
@@ -153 +149 @@
         bp_core_new_subnav_item( array( 'name' => __( 'Recent Posts', 'buddypress' ), 'slug' => 'recent-posts', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_recent_posts', 'position' => 20 ) );
         bp_core_new_subnav_item( array( 'name' => __( 'Recent Comments', 'buddypress' ), 'slug' => 'recent-comments', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_recent_comments', 'position' => 30 ) );
-        bp_core_new_subnav_item( array( 'name' => __( 'Create a Blog', 'buddypress' ), 'slug' => 'create-a-blog', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_create_a_blog', 'position' => 40 ) );
 
         /* Set up the component options navigation for Blog */
@@ -180 +175 @@
 
                 do_action( 'bp_blogs_directory_blogs_setup' );
-                bp_core_load_template( apply_filters( 'bp_blogs_template_directory_blogs_setup', 'directories/blogs/index' ) );
+                bp_core_load_template( apply_filters( 'bp_blogs_template_directory_blogs_setup', 'blogs/index' ) );
         }
 }
@@ -196 +191 @@
 function bp_blogs_screen_my_blogs() {
         do_action( 'bp_blogs_screen_my_blogs' );
-        bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'blogs/my-blogs' ) );
+        bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'members/single/blogs' ) );
 }
 
 function bp_blogs_screen_recent_posts() {
         do_action( 'bp_blogs_screen_recent_posts' );
-        bp_core_load_template( apply_filters( 'bp_blogs_template_recent_posts', 'blogs/recent-posts' ) );
+        bp_core_load_template( apply_filters( 'bp_blogs_template_recent_posts', 'members/single/blogs' ) );
 }
 
 function bp_blogs_screen_recent_comments() {
         do_action( 'bp_blogs_screen_recent_comments' );
-        bp_core_load_template( apply_filters( 'bp_blogs_template_recent_comments', 'blogs/recent-comments' ) );
+        bp_core_load_template( apply_filters( 'bp_blogs_template_recent_comments', 'members/single/blogs' ) );
 }
 
 function bp_blogs_screen_create_a_blog() {
+        global $bp;
+
+        if ( $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
+                return false;
+
+        if ( !is_user_logged_in() || !bp_blog_signup_enabled() )
+                return false;
+
         do_action( 'bp_blogs_screen_create_a_blog' );
         bp_core_load_template( apply_filters( 'bp_blogs_template_create_a_blog', 'blogs/create' ) );
 }
+/* The create screen is not attached to a nav item, so we need to attach it to an action */
+add_action( 'wp', 'bp_blogs_screen_create_a_blog', 3 );
 
 
@@ -599 +604 @@
 add_action( 'delete_comment', 'bp_blogs_remove_comment' );
 
+function bp_blogs_total_blogs() {
+        $blogs = BP_Blogs_Blog::get_all();
+        return $blogs['total'];
+}
+
+function bp_blogs_total_blogs_for_user( $user_id = false ) {
+        global $bp;
+
+        if ( !$user_id )
+                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+
+        return BP_Blogs_Blog::total_blog_count_for_user( $user_id );
+}
+
 function bp_blogs_remove_data_for_blog( $blog_id ) {
         global $bp;
@@ -775 +794 @@
         return true;
 }
+
+/**
+ * bp_blogs_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function bp_blogs_filter_template_paths() {
+        if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+                return false;
+
+        add_filter( 'bp_blogs_template_directory_blogs_setup', create_function( '', 'return "directories/blogs/index";' ) );
+        add_filter( 'bp_blogs_template_my_blogs', create_function( '', 'return "blogs/my-blogs";' ) );
+        add_filter( 'bp_blogs_template_recent_posts', create_function( '', 'return "blogs/recent-posts";' ) );
+        add_filter( 'bp_blogs_template_recent_comments', create_function( '', 'return "blogs/recent-comments";' ) );
+        add_filter( 'bp_blogs_template_create_a_blog', create_function( '', 'return "blogs/create";' ) );
+}
+add_action( 'init', 'bp_blogs_filter_template_paths' );
 
 function bp_blogs_remove_data( $user_id ) {