Changeset 9054 for trunk/src/bp-activity/bp-activity-functions.php

Timestamp:

09/28/2014 06:20:35 PM (10 years ago)

Author:

boonebgorges

Message:

Better error message when attempting to reply to an activity item that has been deleted

Fixes #5907

Props imath

File:

• trunk/src/bp-activity/bp-activity-functions.php (modified) (4 diffs)

trunk/src/bp-activity/bp-activity-functions.php

@@ -1330 +1330 @@
  */
 function bp_activity_new_comment( $args = '' ) {
+    $bp       = buddypress();
+    $errors   = new WP_Error();
+    $feedback = __( 'There was an error posting your reply. Please try again.', 'buddypress' );
+
+    if ( empty( $bp->activity->errors ) ) {
+        $bp->activity->errors = array();
+    }
 
     $r = wp_parse_args( $args, array(
@@ -1341 +1348 @@
     // Bail if missing necessary data
     if ( empty( $r['content'] ) || empty( $r['user_id'] ) || empty( $r['activity_id'] ) ) {
+        $errors->add( 'missing_data', $feedback );
+        $bp->activity->errors['new_comment'] = $errors;
+
         return false;
     }
@@ -1356 +1366 @@
     // Bail if the parent activity does not exist
     if ( empty( $activity->date_recorded ) ) {
+        $errors->add( 'missing_activity', __( 'Sorry, the item you are replying to no longer exists.', 'buddypress' ) );
+        $bp->activity->errors['new_comment'] = $errors;
+
         return false;
     }
@@ -1387 +1400 @@
 
     do_action( 'bp_activity_comment_posted', $comment_id, $r, $activity );
+
+    if ( empty( $comment_id ) ) {
+        $errors->add( 'comment_failed', $feedback );
+        $bp->activity->errors['new_comment'] = $errors;
+    }
 
     return $comment_id;