Changeset 430

Timestamp:

10/23/2008 04:15:30 PM (18 years ago)

Author:

apeatling

Message:

Added load_textdomain() call.

Location:

trunk

Files:

• bp-blogs/bp-blogs-classes.php (modified) (2 diffs)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (3 diffs)

trunk/bp-blogs/bp-blogs-classes.php

@@ -83 +83 @@
             
         $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp['blogs']['table_name'] . " WHERE user_id = %d", $user_id) );
-        $total_blog_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(blog_id) FROM " . $bp['blogs']['table_name'] . " WHERE user_id = %d", $user_id) );
+        $total_blog_count = BP_Blogs_Blog::total_blog_count( $user_id );
         
         for ( $i = 0; $i < count($blog_ids); $i++ ) {
@@ -96 +96 @@
         return array( 'blogs' => $blogs, 'count' => $total_blog_count );
     }
+    
+    function total_blog_count( $user_id = null ) {
+        global $bp, $wpdb;
+        
+        if ( !$user_id )
+            $user_id = $bp['current_userid'];
+        
+        return $wpdb->get_var( $wpdb->prepare( "SELECT count(blog_id) FROM " . $bp['blogs']['table_name'] . " WHERE user_id = %d", $user_id) );
+    }
 }
 

trunk/bp-core.php

@@ -2 +2 @@
 /* Define the current version number for checking if DB tables are up to date. */
 define( 'BP_CORE_VERSION', '0.2.6.1' );
+
+/* Load the language file */
+if ( file_exists(ABSPATH . 'wp-content/mu-plugins/bp-languages/buddypress-' . get_locale() . '.mo') )
+    load_textdomain( 'buddypress', ABSPATH . 'wp-content/mu-plugins/bp-languages/buddypress-' . get_locale() . '.mo' );
 
 /* These components are accessed via the root, and not under a blog name or home base.

trunk/bp-core/bp-core-catchuri.php

@@ -15 +15 @@
  *
  * The URI's are broken down as follows:
- *   - VHOST: http:// andy.domain.com / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
- *   - NO VHOST: http:// domain.com / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
- *   - OUTSIDE ROOT: http:// domain.com / sites / buddypress / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
+ *   - http:// domain.com / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
+ *   - OUTSIDE ROOT: http:// domain.com / sites / buddypress / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
  * 
  *  Example:
- *    - http://andy.domain.com/profile/edit/group/5/
+ *    - http://domain.com/members/andy/profile/edit/group/5/
  *    - $current_component: string 'profile'
  *    - $current_action: string 'edit'

trunk/bp-core/bp-core-classes.php

@@ -30 +30 @@
     var $status_last_updated;
     
-    var $content_last_updated;
+    /* Extras */
+    var $total_friends;
+    var $total_blogs;
+    var $total_groups;
     
-    function bp_core_user( $user_id ) {
+    function bp_core_user( $user_id, $populate_extras = false ) {
         if ( $user_id ) {
             $this->id = $user_id;
-            $this->populate( $this->id );
+            $this->populate();
+            
+            if ( $populate_extras )
+                $this->populate_extras();
         }
     }
@@ -54 +60 @@
      */
     function populate() {
-        global $userdata;
-
         $this->user_url = bp_core_get_userurl( $this->id );
         $this->user_link = bp_core_get_userlink( $this->id );
@@ -72 +76 @@
             $this->status = null; // TODO: Fetch status updates.
             $this->status_last_updated = null;
+        }
+    }
+    
+    function populate_extras() {
+        $this->total_friends = BP_Friends_Friendship::total_friend_count( $this->id );
+
+        if ( $this->total_friends ) {
+            if ( $this->total_friends == 1 )
+                $this->total_friends .= ' ' . __( 'friend', 'buddypress' );
+            else
+                $this->total_friends .= ' ' . __( 'friends', 'buddypress' );
+        }
+        
+        if ( $this->total_blogs ) {
+            if ( $this->total_blogs == 1 )
+                $this->total_blogs .= ' ' . __( 'blog', 'buddypress' );
+            else
+                $this->total_blogs .= ' ' . __( 'blogs', 'buddypress' );            
+        }
+    
+        if ( function_exists('groups_install') ) {
+            $this->total_groups = BP_Groups_Member::total_group_count( $this->id );
+            
+            if ( $this->total_groups ) {
+                if ( $this->total_groups == 1 )
+                    $this->total_groups .= ' ' . __( 'group', 'buddypress' );
+                else
+                    $this->total_groups .= ' ' . __( 'groups', 'buddypress' );
+            }
         }
     }