Changeset 1891

Timestamp:

09/16/2009 09:23:40 PM (16 years ago)

Author:

apeatling

Message:

Fixing profile pages to work when xprofile is disabled. Added more extensive options to groups_invite_user().

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-core.php (modified) (2 diffs)
• bp-groups.php (modified) (2 diffs)
• bp-groups/deprecated/bp-groups-deprecated.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/screen.css (modified) (2 diffs)
• bp-themes/bp-sn-parent/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-sn-parent/profile/index.php (modified) (1 diff)
• bp-wire.php (modified) (1 diff)

trunk/bp-activity.php

@@ -226 +226 @@
     
     $defaults = array(
-        'user_id' => $bp->loggedin_user->id,
-        'content' => false,
-        'primary_link' => false,
-        'component_name' => false,
-        'component_action' => false,
-        'item_id' => false,
-        'secondary_item_id' => false,
-        'recorded_time' => time(),
-        'hide_sitewide' => false
+        'user_id' => $bp->loggedin_user->id, // The user to record the activity for
+        'content' => false, // The content of the activity item
+        'primary_link' => false, // The primary URL for this item in RSS feeds
+        'component_name' => false, // The name/ID of the component e.g. groups, profile, mycomponent
+        'component_action' => false, // The component action e.g. new_wire_post, profile_updated
+        'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id, or wire_post_id
+        'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id
+        'recorded_time' => time(), // The time that this activity was recorded
+        'hide_sitewide' => false // Should this be hidden on the sitewide activity stream?
     );
 

trunk/bp-core.php

@@ -325 +325 @@
     global $bp;
     
-    if ( !function_exists('xprofile_install') ) {
+    /*** 
+     * If the extended profiles component is disabled, we need to revert to using the
+     * built in WordPress profile information
+     */
+    if ( !function_exists( 'xprofile_install' ) ) {
+        /* Fallback wire values if xprofile is disabled */
+        $bp->core->profile->slug = 'profile';
+        $bp->active_components[$bp->core->profile->slug] = $bp->core->profile->slug;
+
         /* Add 'Profile' to the main navigation */
-        bp_core_add_nav_item( __('Profile', 'buddypress'), 'profile' );
-        bp_core_add_nav_default( 'profile', 'bp_core_catch_profile_uri', 'public' );
+        bp_core_new_nav_item( array( 
+            'name' => __('Profile', 'buddypress'),
+            'slug' => $bp->core->profile->slug,
+            'position' => 20,
+            'screen_function' => 'bp_core_catch_profile_uri',
+            'default_subnav_slug' => 'public'
+        ) );
 
         $profile_link = $bp->loggedin_user->domain . '/profile/';
-
+        
         /* Add the subnav items to the profile */
         bp_core_new_subnav_item( array(
@@ -337 +350 @@
             'slug' => 'public',
             'parent_url' => $profile_link,
-            'parent_slug' => 'profile',
-            'screen_function' => 'xprofile_screen_display_profile',
-            'position' => 10
+            'parent_slug' => $bp->core->profile->slug,
+            'screen_function' => 'bp_core_catch_profile_uri'
         ) );
+        
 
         if ( 'profile' == $bp->current_component ) {

trunk/bp-groups.php

@@ -2211 +2211 @@
 }
 
-function groups_invite_user( $user_id, $group_id ) {
-    global $bp;
+function groups_invite_user( $args = '' ) {
+    global $bp;
+    
+    $defaults = array(
+        'user_id' => false,
+        'group_id' => false,
+        'inviter_id' => $bp->loggedin_user->id,
+        'date_modified' => time(),
+        'is_confirmed' => 0
+    );
+
+    $args = wp_parse_args( $args, $defaults );
+    extract( $args, EXTR_SKIP );    
+
+    if ( !$user_id || !$group_id )
+        return false;
     
     if ( groups_is_user_member( $user_id, $group_id ) )
@@ -2220 +2234 @@
     $invite->group_id = $group_id;
     $invite->user_id = $user_id;
-    $invite->date_modified = time();
-    $invite->inviter_id = $bp->loggedin_user->id;
-    $invite->is_confirmed = 0;
+    $invite->date_modified = $date_modified;
+    $invite->inviter_id = $inviter_id;
+    $invite->is_confirmed = $is_confirmed;
     
     if ( !$invite->save() )
         return false;
     
-    do_action( 'groups_invite_user', $group_id, $user_id );
+    do_action( 'groups_invite_user', $args );
         
     return true;
 }
 
-function groups_uninvite_user( $user_id, $group_id, $deprecated = true ) {
+function groups_uninvite_user( $user_id, $group_id ) {
     global $bp;
     

trunk/bp-groups/deprecated/bp-groups-deprecated.php

@@ -636 +636 @@
     if ( 'invite' == $_POST['friend_action'] ) {
                 
-        if ( !groups_invite_user( $_POST['friend_id'], $_POST['group_id'] ) )
+        if ( !groups_invite_user( array( 'user_id' => $_POST['friend_id'], 'group_id' => $_POST['group_id'] ) ) )
             return false;
         

trunk/bp-themes/bp-default/_inc/css/screen.css

@@ -1972 +1972 @@
 /**** PROFILES ************************/
 
-table.profile-fields tr.alt {
+table.profile-fields tr.alt, table.wp-profile-fields tr.alt {
     background: #f0f0f0;
 }
 
-table.profile-fields tr td.label {
+table.profile-fields tr td.label, table.wp-profile-fields tr td.label {
     border-right: 1px solid #dadada;
     font-weight: bold;
@@ -1985 +1985 @@
 }
 
-table.profile-fields {
+table.profile-fields, table.wp-profile-fields {
     width: 100%;
 }
-    table.profile-fields tr td {
+    table.profile-fields tr td, table.wp-profile-fields tr td {
         padding: 0.5em 1em;
     }
     
-    table.profile-fields tr td.label {
+    table.profile-fields tr td.label, table.wp-profile-fields tr td.label {
         width: 130px;
     }

trunk/bp-themes/bp-sn-parent/_inc/ajax.php

@@ -80 +80 @@
     if ( 'invite' == $_POST['friend_action'] ) {
                 
-        if ( !groups_invite_user( $_POST['friend_id'], $_POST['group_id'] ) )
+        if ( !groups_invite_user( array( 'user_id' => $_POST['friend_id'], 'group_id' => $_POST['group_id'] ) ) )
             return false;
         

trunk/bp-themes/bp-sn-parent/profile/index.php

@@ -128 +128 @@
 
             <?php /* Profile Wire Loop - uses [TEMPLATEPATH]/wire/post-list.php */ ?>
-            <?php if ( function_exists('bp_wire_get_post_list') ) : ?>
+            <?php if ( function_exists('bp_wire_get_post_list') && function_exists( 'xprofile_install' ) ) : ?>
 
                 <?php do_action( 'bp_before_profile_wire_widget' ) ?>

trunk/bp-wire.php

@@ -34 +34 @@
     global $bp;
 
+    /* Profile wire's will only work if xprofile is enabled */
+    if ( !function_exists( 'xprofile_install' ) )
+        return false;
+        
     /* Add 'Wire' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __('Wire', 'buddypress'), 'slug' => $bp->wire->slug, 'position' => 40, 'screen_function' => 'bp_wire_screen_latest', 'default_subnav_slug' => 'all-posts', 'item_css_id' => $bp->wire->id ) );