Changeset 2409

Timestamp:

01/23/2010 01:48:47 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1671

Location:

trunk

Files:

• bp-groups.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/members/single/messages/single.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-groups.php

@@ -1333 +1333 @@
         extract( $r, EXTR_SKIP );
 
-        /* Check for an existing entry and update if one exists. */
-        $id = bp_activity_get_activity_id( array(
-                'user_id' => $user_id,
-                'component' => $component,
-                'type' => $type,
-                'item_id' => $item_id,
-                'secondary_item_id' => $secondary_item_id
-        ) );
-
-        return bp_activity_add( array( 'id' => $id, 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+        return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -445 +445 @@
         check_ajax_referer( 'messages_send_message' );
 
-        $result = messages_new_message( array( 'thread_id' => $_REQUEST['thread_id'], 'subject' => $_REQUEST['subject'], 'content' => $_REQUEST['content'] ) );
+        $result = messages_new_message( array( 'thread_id' => $_REQUEST['thread_id'], 'content' => $_REQUEST['content'] ) );
 
         if ( $result ) { ?>

trunk/bp-themes/bp-default/members/single/messages/single.php

@@ -82 +82 @@
 
                                         <input type="hidden" id="thread_id" name="thread_id" value="<?php bp_the_thread_id(); ?>" />
-                                        <input type="hidden" name="subject" id="subject" value="<?php _e( 'Re: ', 'buddypress' ); echo str_replace( 'Re: ', '', bp_get_the_thread_subject() ); ?>" />
                                         <?php wp_nonce_field( 'messages_send_message', 'send_message_nonce' ) ?>
 

trunk/bp-xprofile.php

@@ -497 +497 @@
         extract( $r, EXTR_SKIP );
 
-        /* Check for an existing entry and update if one exists. */
-        $id = bp_activity_get_activity_id( array(
-                'user_id' => $user_id,
-                'component' => $component,
-                'type' => $type,
-                'item_id' => $item_id,
-                'secondary_item_id' => $secondary_item_id
-        ) );
-
-        return bp_activity_add( array( 'id' => $id, 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+        return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }