Changeset 2168 for trunk/bp-core.php

Timestamp:

12/14/2009 03:24:05 PM (16 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-core.php (modified) (9 diffs)

trunk/bp-core.php

@@ -43 +43 @@
     require ( BP_PLUGIN_DIR . '/bp-core/bp-core-adminbar.php' );
 
-/* If BP_IGNORE_DEPRECATED is defined, do not load any deprecated functions for backwards support */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-core/deprecated/bp-core-deprecated.php' );
-
 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */
 if ( !defined( 'BP_MEMBERS_SLUG' ) )
@@ -66 +62 @@
 if ( !defined( 'BP_HOME_BLOG_SLUG' ) )
     define( 'BP_HOME_BLOG_SLUG', 'blog' );
-
-/* Register BuddyPress themes contained within the theme folder */
-if ( function_exists( 'register_theme_folder' ) )
-    register_theme_folder( 'buddypress/bp-themes' );
 
 /* Register BuddyPress themes contained within the theme folder */
@@ -381 +373 @@
 
 /********************************************************************************
- * Screen Functions
- *
- * Screen functions are the controllers of BuddyPress. They will execute when their
- * specific URL is caught. They will first save or manipulate data using business
- * functions, then pass on the user to a template file.
- */
-
-
-/********************************************************************************
  * Action Functions
  *
@@ -397 +380 @@
  */
 
-
 /**
  * bp_core_action_directory_members()
@@ -416 +398 @@
 
         do_action( 'bp_core_action_directory_members' );
-        bp_core_load_template( apply_filters( 'bp_core_template_directory_members', 'directories/members/index' ) );
+        bp_core_load_template( apply_filters( 'bp_core_template_directory_members', 'members/index' ) );
     }
 }
@@ -653 +635 @@
      * looking at their own profile, don't create the nav item.
      */
-    if ( !$show_for_displayed_user && !bp_is_home() )
+    if ( !$show_for_displayed_user && !bp_is_my_profile() )
         return false;
 
@@ -1176 +1158 @@
     $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) );
     return apply_filters( 'bp_core_get_userlink_by_username', bp_core_get_userlink( $user_id, false, false, true ) );
+}
+
+/**
+ * bp_core_get_total_member_count()
+ *
+ * Returns the total number of members for the installation.
+ *
+ * @package BuddyPress Core
+ * @return int The total number of members.
+ */
+function bp_core_get_total_member_count() {
+    global $wpdb;
+
+    $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0" ) );
+    return apply_filters( 'bp_core_get_total_member_count', (int)$count );
 }
 
@@ -1760 +1757 @@
  * bp_core_boot_spammer()
  *
- * When a user logs in, check if they have been marked as a spammer. If then simply
+ * When a user logs in, check if they have been marked as a spammer. If yes then simply
  * redirect them to the home page and stop them from logging in.
  *
@@ -1831 +1828 @@
 }
 add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
+
+/**
+ * bp_core_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_core_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+
+    add_filter( 'bp_core_template_directory_members', create_function( '', 'return "directories/members/index";' ) );
+    add_filter( 'bp_core_template_plugin', create_function( '', 'return "plugin-template";' ) );
+}
+add_action( 'init', 'bp_core_filter_template_paths' );
 
 /**