Index: src/includes/common/functions.php --- src/includes/common/functions.php +++ src/includes/common/functions.php @@ -526,13 +526,13 @@ // Filter name $r['bbp_anonymous_name'] = apply_filters( 'bbp_pre_anonymous_post_author_name', $r['bbp_anonymous_name'] ); if ( empty( $r['bbp_anonymous_name'] ) ) { - bbp_add_error( 'bbp_anonymous_name', __( 'ERROR: Invalid author name.', 'bbpress' ) ); + bbp_add_error( 'bbp_anonymous_name', __( 'Invalid author name.', 'bbpress' ) ); } // Filter email address $r['bbp_anonymous_email'] = apply_filters( 'bbp_pre_anonymous_post_author_email', $r['bbp_anonymous_email'] ); if ( empty( $r['bbp_anonymous_email'] ) ) { - bbp_add_error( 'bbp_anonymous_email', __( 'ERROR: Invalid email address.', 'bbpress' ) ); + bbp_add_error( 'bbp_anonymous_email', __( 'Invalid email address.', 'bbpress' ) ); } // Website is optional (can be empty) Index: src/includes/core/functions.php --- src/includes/core/functions.php +++ src/includes/core/functions.php @@ -286,11 +286,30 @@ * @param string $message Translated error message * @param string $data Any additional data passed with the error message */ -function bbp_add_error( $code = '', $message = '', $data = '' ) { +function bbp_add_notice( $code = '', $message = '', $data = '' ) { bbpress()->errors->add( $code, $message, $data ); } /** + * Adds an error message to later be output in the theme + * + * @since 2.0.0 bbPress (r3381) + * + * @see WP_Error() + * + * @param string $code Unique code for the error message + * @param string $message Translated error message + * @param string $data Any additional data passed with the error message + */ +function bbp_add_error( $code = '', $message = '', $data = '' ) { + + // Add "Error" prefix + $prefix = __( 'ERROR: ', 'bbpress' ); + + bbpress()->errors->add( $code, $prefix . $message, $data ); +} + +/** * Check if error messages exist in queue * * @since 2.0.0 bbPress (r3381) Index: src/includes/extend/buddypress/groups.php --- src/includes/extend/buddypress/groups.php +++ src/includes/extend/buddypress/groups.php @@ -397,7 +397,7 @@ // Theme-side Nonce check } elseif ( ! bbp_verify_nonce_request( 'groups_edit_save_' . $this->slug ) ) { - bbp_add_error( 'bbp_edit_group_forum_screen_save', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_group_forum_screen_save', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } @@ -554,7 +554,7 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'groups_create_save_' . $this->slug ) ) { - bbp_add_error( 'bbp_create_group_forum_screen_save', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_create_group_forum_screen_save', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } Index: src/includes/extend/buddypress/notifications.php --- src/includes/extend/buddypress/notifications.php +++ src/includes/extend/buddypress/notifications.php @@ -193,11 +193,11 @@ // Check nonce if ( ! bbp_verify_nonce_request( 'bbp_mark_topic_' . $topic_id ) ) { - bbp_add_error( 'bbp_notification_topic_id', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_notification_topic_id', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); // Check current user's ability to edit the user } elseif ( ! current_user_can( 'edit_user', $user_id ) ) { - bbp_add_error( 'bbp_notification_permission', __( 'ERROR: You do not have permission to mark notifications for that user.', 'bbpress' ) ); + bbp_add_error( 'bbp_notification_permission', __( 'You do not have permission to mark notifications for that user.', 'bbpress' ) ); } // Bail if we have errors Index: src/includes/forums/functions.php --- src/includes/forums/functions.php +++ src/includes/forums/functions.php @@ -119,7 +119,7 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'bbp-new-forum' ) ) { - bbp_add_error( 'bbp_new_forum_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_new_forum_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } @@ -133,7 +133,7 @@ // User cannot create forums if ( ! current_user_can( 'publish_forums' ) ) { - bbp_add_error( 'bbp_forum_permission', __( 'ERROR: You do not have permission to create new forums.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_permission', __( 'You do not have permission to create new forums.', 'bbpress' ) ); return; } @@ -158,12 +158,12 @@ // No forum title if ( empty( $forum_title ) ) { - bbp_add_error( 'bbp_forum_title', __( 'ERROR: Your forum needs a title.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_title', __( 'Your forum needs a title.', 'bbpress' ) ); } // Title too long if ( bbp_is_title_too_long( $forum_title ) ) { - bbp_add_error( 'bbp_forum_title', __( 'ERROR: Your title is too long.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_title', __( 'Your title is too long.', 'bbpress' ) ); } /** Forum Content *********************************************************/ @@ -177,7 +177,7 @@ // No forum content if ( empty( $forum_content ) ) { - bbp_add_error( 'bbp_forum_content', __( 'ERROR: Your forum description cannot be empty.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_content', __( 'Your forum description cannot be empty.', 'bbpress' ) ); } /** Forum Parent **********************************************************/ @@ -192,48 +192,48 @@ // No forum parent was passed (should never happen) if ( empty( $forum_parent_id ) ) { - bbp_add_error( 'bbp_new_forum_missing_parent', __( 'ERROR: Your forum must have a parent.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_forum_missing_parent', __( 'Your forum must have a parent.', 'bbpress' ) ); // Forum exists } elseif ( ! empty( $forum_parent_id ) ) { // Forum is a category if ( bbp_is_forum_category( $forum_parent_id ) ) { - bbp_add_error( 'bbp_new_forum_forum_category', __( 'ERROR: This forum is a category. No forums can be created in this forum.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_forum_forum_category', __( 'This forum is a category. No forums can be created in this forum.', 'bbpress' ) ); } // Forum is closed and user cannot access if ( bbp_is_forum_closed( $forum_parent_id ) && ! current_user_can( 'edit_forum', $forum_parent_id ) ) { - bbp_add_error( 'bbp_new_forum_forum_closed', __( 'ERROR: This forum has been closed to new forums.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_forum_forum_closed', __( 'This forum has been closed to new forums.', 'bbpress' ) ); } // Forum is private and user cannot access if ( bbp_is_forum_private( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) { - bbp_add_error( 'bbp_new_forum_forum_private', __( 'ERROR: This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_forum_forum_private', __( 'This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); } // Forum is hidden and user cannot access if ( bbp_is_forum_hidden( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) { - bbp_add_error( 'bbp_new_forum_forum_hidden', __( 'ERROR: This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_forum_forum_hidden', __( 'This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); } } /** Forum Flooding ********************************************************/ if ( ! bbp_check_for_flood( $anonymous_data, $forum_author ) ) { - bbp_add_error( 'bbp_forum_flood', __( 'ERROR: Slow down; you move too fast.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_flood', __( 'Slow down; you move too fast.', 'bbpress' ) ); } /** Forum Duplicate *******************************************************/ if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_forum_post_type(), 'post_author' => $forum_author, 'post_content' => $forum_content, 'anonymous_data' => $anonymous_data ) ) ) { - bbp_add_error( 'bbp_forum_duplicate', __( 'ERROR: This forum already exists.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_duplicate', __( 'This forum already exists.', 'bbpress' ) ); } /** Forum Blacklist *******************************************************/ if ( ! bbp_check_for_blacklist( $anonymous_data, $forum_author, $forum_title, $forum_content ) ) { - bbp_add_error( 'bbp_forum_blacklist', __( 'ERROR: Your forum cannot be created at this time.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_blacklist', __( 'Your forum cannot be created at this time.', 'bbpress' ) ); } /** Forum Moderation ******************************************************/ @@ -346,11 +346,11 @@ // WP_Error } elseif ( is_wp_error( $forum_id ) ) { - bbp_add_error( 'bbp_forum_error', sprintf( __( 'ERROR: The following problem(s) occurred: %s', 'bbpress' ), $forum_id->get_error_message() ) ); + bbp_add_error( 'bbp_forum_error', sprintf( __( 'The following problem(s) occurred: %s', 'bbpress' ), $forum_id->get_error_message() ) ); // Generic error } else { - bbp_add_error( 'bbp_forum_error', __( 'ERROR: The forum was not created.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_error', __( 'The forum was not created.', 'bbpress' ) ); } } @@ -375,7 +375,7 @@ // Forum id was not passed if ( empty( $_POST['bbp_forum_id'] ) ) { - bbp_add_error( 'bbp_edit_forum_id', __( 'ERROR: Forum ID not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_id', __( 'Forum ID not found.', 'bbpress' ) ); return; // Forum id was passed @@ -386,17 +386,17 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'bbp-edit-forum_' . $forum_id ) ) { - bbp_add_error( 'bbp_edit_forum_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; // Forum does not exist } elseif ( empty( $forum ) ) { - bbp_add_error( 'bbp_edit_forum_not_found', __( 'ERROR: The forum you want to edit was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_not_found', __( 'The forum you want to edit was not found.', 'bbpress' ) ); return; // User cannot edit this forum } elseif ( ! current_user_can( 'edit_forum', $forum_id ) ) { - bbp_add_error( 'bbp_edit_forum_permission', __( 'ERROR: You do not have permission to edit that forum.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_permission', __( 'You do not have permission to edit that forum.', 'bbpress' ) ); return; } @@ -422,17 +422,17 @@ // Forum is closed and user cannot access if ( bbp_is_forum_closed( $forum_parent_id ) && ! current_user_can( 'edit_forum', $forum_parent_id ) ) { - bbp_add_error( 'bbp_edit_forum_forum_closed', __( 'ERROR: This forum has been closed to new forums.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_forum_closed', __( 'This forum has been closed to new forums.', 'bbpress' ) ); } // Forum is private and user cannot access if ( bbp_is_forum_private( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) { - bbp_add_error( 'bbp_edit_forum_forum_private', __( 'ERROR: This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_forum_private', __( 'This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); } // Forum is hidden and user cannot access if ( bbp_is_forum_hidden( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) { - bbp_add_error( 'bbp_edit_forum_forum_hidden', __( 'ERROR: This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_forum_hidden', __( 'This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) ); } } @@ -447,12 +447,12 @@ // No forum title if ( empty( $forum_title ) ) { - bbp_add_error( 'bbp_edit_forum_title', __( 'ERROR: Your forum needs a title.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_title', __( 'Your forum needs a title.', 'bbpress' ) ); } // Title too long if ( bbp_is_title_too_long( $forum_title ) ) { - bbp_add_error( 'bbp_forum_title', __( 'ERROR: Your title is too long.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_title', __( 'Your title is too long.', 'bbpress' ) ); } /** Forum Content *********************************************************/ @@ -466,13 +466,13 @@ // No forum content if ( empty( $forum_content ) ) { - bbp_add_error( 'bbp_edit_forum_content', __( 'ERROR: Your forum description cannot be empty.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_forum_content', __( 'Your forum description cannot be empty.', 'bbpress' ) ); } /** Forum Blacklist *******************************************************/ if ( ! bbp_check_for_blacklist( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content ) ) { - bbp_add_error( 'bbp_forum_blacklist', __( 'ERROR: Your forum cannot be edited at this time.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_blacklist', __( 'Your forum cannot be edited at this time.', 'bbpress' ) ); } /** Forum Moderation ******************************************************/ @@ -586,7 +586,7 @@ } else { $append_error = ( is_wp_error( $forum_id ) && $forum_id->get_error_message() ) ? $forum_id->get_error_message() . ' ' : ''; - bbp_add_error( 'bbp_forum_error', __( 'ERROR: The following problem(s) have been found with your forum:' . $append_error . 'Please try again.', 'bbpress' ) ); + bbp_add_error( 'bbp_forum_error', __( 'The following problem(s) have been found with your forum:' . $append_error . 'Please try again.', 'bbpress' ) ); } } Index: src/includes/replies/functions.php --- src/includes/replies/functions.php +++ src/includes/replies/functions.php @@ -126,7 +126,7 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'bbp-new-reply' ) ) { - bbp_add_error( 'bbp_new_reply_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_new_reply_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } @@ -151,7 +151,7 @@ // User cannot create replies if ( ! current_user_can( 'publish_replies' ) ) { - bbp_add_error( 'bbp_reply_permission', __( 'ERROR: You do not have permission to reply.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_permission', __( 'You do not have permission to reply.', 'bbpress' ) ); } // Reply author is current user @@ -162,11 +162,11 @@ // Topic id was not passed if ( empty( $_POST['bbp_topic_id'] ) ) { - bbp_add_error( 'bbp_reply_topic_id', __( 'ERROR: Topic ID is missing.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_topic_id', __( 'Topic ID is missing.', 'bbpress' ) ); // Topic id is not a number } elseif ( ! is_numeric( $_POST['bbp_topic_id'] ) ) { - bbp_add_error( 'bbp_reply_topic_id', __( 'ERROR: Topic ID must be a number.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_topic_id', __( 'Topic ID must be a number.', 'bbpress' ) ); // Topic id might be valid } else { @@ -176,11 +176,11 @@ // Topic id is a negative number if ( 0 > $posted_topic_id ) { - bbp_add_error( 'bbp_reply_topic_id', __( 'ERROR: Topic ID cannot be a negative number.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_topic_id', __( 'Topic ID cannot be a negative number.', 'bbpress' ) ); // Topic does not exist } elseif ( ! bbp_get_topic( $posted_topic_id ) ) { - bbp_add_error( 'bbp_reply_topic_id', __( 'ERROR: Topic does not exist.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_topic_id', __( 'Topic does not exist.', 'bbpress' ) ); // Use the POST'ed topic id } else { @@ -199,11 +199,11 @@ // Empty Forum id was passed if ( empty( $_POST['bbp_forum_id'] ) ) { - bbp_add_error( 'bbp_reply_forum_id', __( 'ERROR: Forum ID is missing.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_forum_id', __( 'Forum ID is missing.', 'bbpress' ) ); // Forum id is not a number } elseif ( ! is_numeric( $_POST['bbp_forum_id'] ) ) { - bbp_add_error( 'bbp_reply_forum_id', __( 'ERROR: Forum ID must be a number.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_forum_id', __( 'Forum ID must be a number.', 'bbpress' ) ); // Forum id might be valid } else { @@ -213,15 +213,15 @@ // Forum id is empty if ( 0 === $posted_forum_id ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum ID is missing.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum ID is missing.', 'bbpress' ) ); // Forum id is a negative number } elseif ( 0 > $posted_forum_id ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum ID cannot be a negative number.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum ID cannot be a negative number.', 'bbpress' ) ); // Forum does not exist } elseif ( ! bbp_get_forum( $posted_forum_id ) ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum does not exist.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum does not exist.', 'bbpress' ) ); // Use the POST'ed forum id } else { @@ -235,23 +235,23 @@ // Forum is a category if ( bbp_is_forum_category( $forum_id ) ) { - bbp_add_error( 'bbp_new_reply_forum_category', __( 'ERROR: This forum is a category. No replies can be created in this forum.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_reply_forum_category', __( 'This forum is a category. No replies can be created in this forum.', 'bbpress' ) ); // Forum is not a category } else { // Forum is closed and user cannot access if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) { - bbp_add_error( 'bbp_new_reply_forum_closed', __( 'ERROR: This forum has been closed to new replies.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_reply_forum_closed', __( 'This forum has been closed to new replies.', 'bbpress' ) ); } // Forum is private and user cannot access if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_new_reply_forum_private', __( 'ERROR: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_reply_forum_private', __( 'This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); // Forum is hidden and user cannot access } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_new_reply_forum_hidden', __( 'ERROR: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_reply_forum_hidden', __( 'This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); } } } @@ -276,7 +276,7 @@ // Title too long if ( bbp_is_title_too_long( $reply_title ) ) { - bbp_add_error( 'bbp_reply_title', __( 'ERROR: Your title is too long.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_title', __( 'Your title is too long.', 'bbpress' ) ); } /** Reply Content *********************************************************/ @@ -290,25 +290,25 @@ // No reply content if ( empty( $reply_content ) ) { - bbp_add_error( 'bbp_reply_content', __( 'ERROR: Your reply cannot be empty.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_content', __( 'Your reply cannot be empty.', 'bbpress' ) ); } /** Reply Flooding ********************************************************/ if ( ! bbp_check_for_flood( $anonymous_data, $reply_author ) ) { - bbp_add_error( 'bbp_reply_flood', __( 'ERROR: Slow down; you move too fast.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_flood', __( 'Slow down; you move too fast.', 'bbpress' ) ); } /** Reply Duplicate *******************************************************/ if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_reply_post_type(), 'post_author' => $reply_author, 'post_content' => $reply_content, 'post_parent' => $topic_id, 'anonymous_data' => $anonymous_data ) ) ) { - bbp_add_error( 'bbp_reply_duplicate', __( 'ERROR: Duplicate reply detected; it looks as though you’ve already said that.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_duplicate', __( 'Duplicate reply detected; it looks as though you’ve already said that.', 'bbpress' ) ); } /** Reply Blacklist *******************************************************/ if ( ! bbp_check_for_blacklist( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) { - bbp_add_error( 'bbp_reply_blacklist', __( 'ERROR: Your reply cannot be created at this time.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_blacklist', __( 'Your reply cannot be created at this time.', 'bbpress' ) ); } /** Reply Status **********************************************************/ @@ -333,7 +333,7 @@ // If topic is closed, moderators can still reply if ( bbp_is_topic_closed( $topic_id ) && ! current_user_can( 'moderate', $topic_id ) ) { - bbp_add_error( 'bbp_reply_topic_closed', __( 'ERROR: Topic is closed.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_topic_closed', __( 'Topic is closed.', 'bbpress' ) ); } /** Topic Tags ************************************************************/ @@ -393,7 +393,7 @@ // Term error if ( is_wp_error( $terms ) ) { - bbp_add_error( 'bbp_reply_tags', __( 'ERROR: There was a problem adding the tags to the topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_tags', __( 'There was a problem adding the tags to the topic.', 'bbpress' ) ); } /** Trash Check *******************************************************/ @@ -466,11 +466,11 @@ // WP_Error } elseif ( is_wp_error( $reply_id ) ) { - bbp_add_error( 'bbp_reply_error', sprintf( __( 'ERROR: The following problem(s) occurred: %s', 'bbpress' ), $reply_id->get_error_message() ) ); + bbp_add_error( 'bbp_reply_error', sprintf( __( 'The following problem(s) occurred: %s', 'bbpress' ), $reply_id->get_error_message() ) ); // Generic error } else { - bbp_add_error( 'bbp_reply_error', __( 'ERROR: The reply was not created.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_error', __( 'The reply was not created.', 'bbpress' ) ); } } @@ -498,7 +498,7 @@ // Reply id was not passed if ( empty( $_POST['bbp_reply_id'] ) ) { - bbp_add_error( 'bbp_edit_reply_id', __( 'ERROR: Reply ID not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_id', __( 'Reply ID not found.', 'bbpress' ) ); return; // Reply id was passed @@ -509,13 +509,13 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'bbp-edit-reply_' . $reply_id ) ) { - bbp_add_error( 'bbp_edit_reply_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Reply does not exist if ( empty( $reply ) ) { - bbp_add_error( 'bbp_edit_reply_not_found', __( 'ERROR: The reply you want to edit was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_not_found', __( 'The reply you want to edit was not found.', 'bbpress' ) ); return; // Reply exists @@ -526,7 +526,7 @@ // User cannot edit this reply if ( ! current_user_can( 'edit_reply', $reply_id ) ) { - bbp_add_error( 'bbp_edit_reply_permission', __( 'ERROR: You do not have permission to edit that reply.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_permission', __( 'You do not have permission to edit that reply.', 'bbpress' ) ); return; } @@ -561,23 +561,23 @@ // Forum is a category if ( bbp_is_forum_category( $forum_id ) ) { - bbp_add_error( 'bbp_edit_reply_forum_category', __( 'ERROR: This forum is a category. No replies can be created in this forum.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_forum_category', __( 'This forum is a category. No replies can be created in this forum.', 'bbpress' ) ); // Forum is not a category } else { // Forum is closed and user cannot access if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) { - bbp_add_error( 'bbp_edit_reply_forum_closed', __( 'ERROR: This forum has been closed to new replies.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_forum_closed', __( 'This forum has been closed to new replies.', 'bbpress' ) ); } // Forum is private and user cannot access if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_edit_reply_forum_private', __( 'ERROR: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_forum_private', __( 'This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); // Forum is hidden and user cannot access } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_edit_reply_forum_hidden', __( 'ERROR: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_forum_hidden', __( 'This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) ); } } } @@ -593,7 +593,7 @@ // Title too long if ( bbp_is_title_too_long( $reply_title ) ) { - bbp_add_error( 'bbp_reply_title', __( 'ERROR: Your title is too long.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_title', __( 'Your title is too long.', 'bbpress' ) ); } /** Reply Content *********************************************************/ @@ -607,13 +607,13 @@ // No reply content if ( empty( $reply_content ) ) { - bbp_add_error( 'bbp_edit_reply_content', __( 'ERROR: Your reply cannot be empty.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_reply_content', __( 'Your reply cannot be empty.', 'bbpress' ) ); } /** Reply Blacklist *******************************************************/ if ( ! bbp_check_for_blacklist( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) { - bbp_add_error( 'bbp_reply_blacklist', __( 'ERROR: Your reply cannot be edited at this time.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_blacklist', __( 'Your reply cannot be edited at this time.', 'bbpress' ) ); } /** Reply Status **********************************************************/ @@ -703,7 +703,7 @@ // Term error if ( is_wp_error( $terms ) ) { - bbp_add_error( 'bbp_reply_tags', __( 'ERROR: There was a problem adding the tags to the topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_tags', __( 'There was a problem adding the tags to the topic.', 'bbpress' ) ); } /** No Errors *************************************************************/ @@ -761,7 +761,7 @@ } else { $append_error = ( is_wp_error( $reply_id ) && $reply_id->get_error_message() ) ? $reply_id->get_error_message() . ' ' : ''; - bbp_add_error( 'bbp_reply_error', __( 'ERROR: The following problem(s) have been found with your reply:' . $append_error . 'Please try again.', 'bbpress' ) ); + bbp_add_error( 'bbp_reply_error', __( 'The following problem(s) have been found with your reply:' . $append_error . 'Please try again.', 'bbpress' ) ); } } @@ -1195,7 +1195,7 @@ /** Move Reply ***********************************************************/ if ( empty( $_POST['bbp_reply_id'] ) ) { - bbp_add_error( 'bbp_move_reply_reply_id', __( 'ERROR: A reply ID is required', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_reply_id', __( 'A reply ID is required', 'bbpress' ) ); } else { $move_reply_id = (int) $_POST['bbp_reply_id']; } @@ -1204,7 +1204,7 @@ // Reply exists if ( empty( $move_reply ) ) { - bbp_add_error( 'bbp_mover_reply_r_not_found', __( 'ERROR: The reply you want to move was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_mover_reply_r_not_found', __( 'The reply you want to move was not found.', 'bbpress' ) ); } /** Topic to Move From ***************************************************/ @@ -1214,18 +1214,18 @@ // No topic if ( empty( $source_topic ) ) { - bbp_add_error( 'bbp_move_reply_source_not_found', __( 'ERROR: The topic you want to move from was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_source_not_found', __( 'The topic you want to move from was not found.', 'bbpress' ) ); } // Nonce check failed if ( ! bbp_verify_nonce_request( 'bbp-move-reply_' . $move_reply->ID ) ) { - bbp_add_error( 'bbp_move_reply_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Use cannot edit topic if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) { - bbp_add_error( 'bbp_move_reply_source_permission', __( 'ERROR: You do not have permission to edit the source topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_source_permission', __( 'You do not have permission to edit the source topic.', 'bbpress' ) ); } // How to move @@ -1235,7 +1235,7 @@ // Invalid move option if ( empty( $move_option ) || ! in_array( $move_option, array( 'existing', 'topic' ), true ) ) { - bbp_add_error( 'bbp_move_reply_option', __( 'ERROR: You need to choose a valid move option.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_option', __( 'You need to choose a valid move option.', 'bbpress' ) ); // Valid move option } else { @@ -1248,7 +1248,7 @@ // Get destination topic id if ( empty( $_POST['bbp_destination_topic'] ) ) { - bbp_add_error( 'bbp_move_reply_destination_id', __( 'ERROR: A topic ID is required.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_destination_id', __( 'A topic ID is required.', 'bbpress' ) ); } else { $destination_topic_id = (int) $_POST['bbp_destination_topic']; } @@ -1258,12 +1258,12 @@ // No destination topic if ( empty( $destination_topic ) ) { - bbp_add_error( 'bbp_move_reply_destination_not_found', __( 'ERROR: The topic you want to move to was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_destination_not_found', __( 'The topic you want to move to was not found.', 'bbpress' ) ); } // User cannot edit the destination topic if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) { - bbp_add_error( 'bbp_move_reply_destination_permission', __( 'ERROR: You do not have permission to edit the destination topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_destination_permission', __( 'You do not have permission to edit the destination topic.', 'bbpress' ) ); } // Bump the reply position @@ -1317,12 +1317,12 @@ // Shouldn't happen if ( false === $destination_topic_id || is_wp_error( $destination_topic_id ) || empty( $destination_topic ) ) { - bbp_add_error( 'bbp_move_reply_destination_reply', __( 'ERROR: There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_destination_reply', __( 'There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) ); } // User cannot publish posts } else { - bbp_add_error( 'bbp_move_reply_destination_permission', __( 'ERROR: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_move_reply_destination_permission', __( 'You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) ); } break; @@ -1470,13 +1470,13 @@ // Make sure reply exists $reply = bbp_get_reply( $reply_id ); if ( empty( $reply ) ) { - bbp_add_error( 'bbp_toggle_reply_missing', __( 'ERROR: This reply could not be found or no longer exists.', 'bbpress' ) ); + bbp_add_error( 'bbp_toggle_reply_missing', __( 'This reply could not be found or no longer exists.', 'bbpress' ) ); return; } // What is the user doing here? if ( ! current_user_can( 'edit_reply', $reply_id ) || ( 'bbp_toggle_reply_trash' === $action && ! current_user_can( 'delete_reply', $reply_id ) ) ) { - bbp_add_error( 'bbp_toggle_reply_permission', __( 'ERROR: You do not have permission to do that.', 'bbpress' ) ); + bbp_add_error( 'bbp_toggle_reply_permission', __( 'You do not have permission to do that.', 'bbpress' ) ); return; } @@ -1552,7 +1552,7 @@ $is_approve = bbp_is_reply_pending( $r['id'] ); $retval['status'] = $is_approve ? bbp_approve_reply( $r['id'] ) : bbp_unapprove_reply( $r['id'] ); - $retval['message'] = $is_approve ? __( 'ERROR: There was a problem approving the reply.', 'bbpress' ) : __( 'ERROR: There was a problem unapproving the reply.', 'bbpress' ); + $retval['message'] = $is_approve ? __( 'There was a problem approving the reply.', 'bbpress' ) : __( 'There was a problem unapproving the reply.', 'bbpress' ); $retval['view_all'] = ! $is_approve; break; @@ -1563,7 +1563,7 @@ $is_spam = bbp_is_reply_spam( $r['id'] ); $retval['status'] = $is_spam ? bbp_unspam_reply( $r['id'] ) : bbp_spam_reply( $r['id'] ); - $retval['message'] = $is_spam ? __( 'ERROR: There was a problem unmarking the reply as spam.', 'bbpress' ) : __( 'ERROR: There was a problem marking the reply as spam.', 'bbpress' ); + $retval['message'] = $is_spam ? __( 'There was a problem unmarking the reply as spam.', 'bbpress' ) : __( 'There was a problem marking the reply as spam.', 'bbpress' ); $retval['view_all'] = ! $is_spam; break; @@ -1578,7 +1578,7 @@ $retval['view_all'] = true; $retval['status'] = wp_trash_post( $r['id'] ); - $retval['message'] = __( 'ERROR: There was a problem trashing the reply.', 'bbpress' ); + $retval['message'] = __( 'There was a problem trashing the reply.', 'bbpress' ); break; @@ -1586,7 +1586,7 @@ check_ajax_referer( "untrash-{$nonce_suffix}" ); $retval['status'] = wp_untrash_post( $r['id'] ); - $retval['message'] = __( 'ERROR: There was a problem untrashing the reply.', 'bbpress' ); + $retval['message'] = __( 'There was a problem untrashing the reply.', 'bbpress' ); break; @@ -1594,7 +1594,7 @@ check_ajax_referer( "delete-{$nonce_suffix}" ); $retval['status'] = wp_delete_post( $r['id'] ); - $retval['message'] = __( 'ERROR: There was a problem deleting the reply.', 'bbpress' ); + $retval['message'] = __( 'There was a problem deleting the reply.', 'bbpress' ); break; } Index: src/includes/topics/functions.php --- src/includes/topics/functions.php +++ src/includes/topics/functions.php @@ -102,7 +102,7 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'bbp-new-topic' ) ) { - bbp_add_error( 'bbp_new_topic_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_new_topic_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } @@ -129,7 +129,7 @@ // User cannot create topics if ( ! current_user_can( 'publish_topics' ) ) { - bbp_add_error( 'bbp_topic_permission', __( 'ERROR: You do not have permission to create new topics.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_permission', __( 'You do not have permission to create new topics.', 'bbpress' ) ); return; } @@ -155,12 +155,12 @@ // No topic title if ( empty( $topic_title ) ) { - bbp_add_error( 'bbp_topic_title', __( 'ERROR: Your topic needs a title.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_title', __( 'Your topic needs a title.', 'bbpress' ) ); } // Title too long if ( bbp_is_title_too_long( $topic_title ) ) { - bbp_add_error( 'bbp_topic_title', __( 'ERROR: Your title is too long.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_title', __( 'Your title is too long.', 'bbpress' ) ); } /** Topic Content *********************************************************/ @@ -174,7 +174,7 @@ // No topic content if ( empty( $topic_content ) ) { - bbp_add_error( 'bbp_topic_content', __( 'ERROR: Your topic cannot be empty.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_content', __( 'Your topic cannot be empty.', 'bbpress' ) ); } /** Topic Forum ***********************************************************/ @@ -184,11 +184,11 @@ // Empty Forum id was passed if ( empty( $_POST['bbp_forum_id'] ) ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum ID is missing.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum ID is missing.', 'bbpress' ) ); // Forum id is not a number } elseif ( ! is_numeric( $_POST['bbp_forum_id'] ) ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum ID must be a number.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum ID must be a number.', 'bbpress' ) ); // Forum id might be valid } else { @@ -198,15 +198,15 @@ // Forum id is empty if ( 0 === $posted_forum_id ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum ID is missing.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum ID is missing.', 'bbpress' ) ); // Forum id is a negative number } elseif ( 0 > $posted_forum_id ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum ID cannot be a negative number.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum ID cannot be a negative number.', 'bbpress' ) ); // Forum does not exist } elseif ( ! bbp_get_forum( $posted_forum_id ) ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum does not exist.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum does not exist.', 'bbpress' ) ); // Use the POST'ed forum id } else { @@ -220,23 +220,23 @@ // Forum is a category if ( bbp_is_forum_category( $forum_id ) ) { - bbp_add_error( 'bbp_new_topic_forum_category', __( 'ERROR: This forum is a category. No topics can be created in this forum.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_topic_forum_category', __( 'This forum is a category. No topics can be created in this forum.', 'bbpress' ) ); // Forum is not a category } else { // Forum is closed and user cannot access if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) { - bbp_add_error( 'bbp_new_topic_forum_closed', __( 'ERROR: This forum has been closed to new topics.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_topic_forum_closed', __( 'This forum has been closed to new topics.', 'bbpress' ) ); } // Forum is private and user cannot access if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_new_topic_forum_private', __( 'ERROR: This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_topic_forum_private', __( 'This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); // Forum is hidden and user cannot access } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_new_topic_forum_hidden', __( 'ERROR: This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_new_topic_forum_hidden', __( 'This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); } } } @@ -244,19 +244,19 @@ /** Topic Flooding ********************************************************/ if ( ! bbp_check_for_flood( $anonymous_data, $topic_author ) ) { - bbp_add_error( 'bbp_topic_flood', __( 'ERROR: Slow down; you move too fast.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_flood', __( 'Slow down; you move too fast.', 'bbpress' ) ); } /** Topic Duplicate *******************************************************/ if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_topic_post_type(), 'post_author' => $topic_author, 'post_content' => $topic_content, 'anonymous_data' => $anonymous_data ) ) ) { - bbp_add_error( 'bbp_topic_duplicate', __( 'ERROR: Duplicate topic detected; it looks as though you’ve already said that.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_duplicate', __( 'Duplicate topic detected; it looks as though you’ve already said that.', 'bbpress' ) ); } /** Topic Blacklist *******************************************************/ if ( ! bbp_check_for_blacklist( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) { - bbp_add_error( 'bbp_topic_blacklist', __( 'ERROR: Your topic cannot be created at this time.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_blacklist', __( 'Your topic cannot be created at this time.', 'bbpress' ) ); } /** Topic Status **********************************************************/ @@ -397,11 +397,11 @@ // WP_Error } elseif ( is_wp_error( $topic_id ) ) { - bbp_add_error( 'bbp_topic_error', sprintf( __( 'ERROR: The following problem(s) occurred: %s', 'bbpress' ), $topic_id->get_error_message() ) ); + bbp_add_error( 'bbp_topic_error', sprintf( __( 'The following problem(s) occurred: %s', 'bbpress' ), $topic_id->get_error_message() ) ); // Generic error } else { - bbp_add_error( 'bbp_topic_error', __( 'ERROR: The topic was not created.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_error', __( 'The topic was not created.', 'bbpress' ) ); } } @@ -427,7 +427,7 @@ // Topic id was not passed if ( empty( $_POST['bbp_topic_id'] ) ) { - bbp_add_error( 'bbp_edit_topic_id', __( 'ERROR: Topic ID not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_id', __( 'Topic ID not found.', 'bbpress' ) ); return; // Topic id was passed @@ -438,7 +438,7 @@ // Topic does not exist if ( empty( $topic ) ) { - bbp_add_error( 'bbp_edit_topic_not_found', __( 'ERROR: The topic you want to edit was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_not_found', __( 'The topic you want to edit was not found.', 'bbpress' ) ); return; // Topic exists @@ -449,7 +449,7 @@ // User cannot edit this topic if ( ! current_user_can( 'edit_topic', $topic_id ) ) { - bbp_add_error( 'bbp_edit_topic_permission', __( 'ERROR: You do not have permission to edit that topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_permission', __( 'You do not have permission to edit that topic.', 'bbpress' ) ); } // Set topic author @@ -465,7 +465,7 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'bbp-edit-topic_' . $topic_id ) ) { - bbp_add_error( 'bbp_edit_topic_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } @@ -480,7 +480,7 @@ // Forum id was not passed if ( empty( $_POST['bbp_forum_id'] ) ) { - bbp_add_error( 'bbp_topic_forum_id', __( 'ERROR: Forum ID is missing.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_forum_id', __( 'Forum ID is missing.', 'bbpress' ) ); // Forum id was passed } elseif ( is_numeric( $_POST['bbp_forum_id'] ) ) { @@ -495,23 +495,23 @@ // Forum is a category if ( bbp_is_forum_category( $forum_id ) ) { - bbp_add_error( 'bbp_edit_topic_forum_category', __( 'ERROR: This forum is a category. No topics can be created in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_forum_category', __( 'This forum is a category. No topics can be created in it.', 'bbpress' ) ); // Forum is not a category } else { // Forum is closed and user cannot access if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) { - bbp_add_error( 'bbp_edit_topic_forum_closed', __( 'ERROR: This forum has been closed to new topics.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_forum_closed', __( 'This forum has been closed to new topics.', 'bbpress' ) ); } // Forum is private and user cannot access if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_edit_topic_forum_private', __( 'ERROR: This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_forum_private', __( 'This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); // Forum is hidden and user cannot access } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) { - bbp_add_error( 'bbp_edit_topic_forum_hidden', __( 'ERROR: This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_forum_hidden', __( 'This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) ); } } } @@ -527,12 +527,12 @@ // No topic title if ( empty( $topic_title ) ) { - bbp_add_error( 'bbp_edit_topic_title', __( 'ERROR: Your topic needs a title.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_title', __( 'Your topic needs a title.', 'bbpress' ) ); } // Title too long if ( bbp_is_title_too_long( $topic_title ) ) { - bbp_add_error( 'bbp_topic_title', __( 'ERROR: Your title is too long.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_title', __( 'Your title is too long.', 'bbpress' ) ); } /** Topic Content *********************************************************/ @@ -546,13 +546,13 @@ // No topic content if ( empty( $topic_content ) ) { - bbp_add_error( 'bbp_edit_topic_content', __( 'ERROR: Your topic cannot be empty.', 'bbpress' ) ); + bbp_add_error( 'bbp_edit_topic_content', __( 'Your topic cannot be empty.', 'bbpress' ) ); } /** Topic Blacklist *******************************************************/ if ( ! bbp_check_for_blacklist( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) { - bbp_add_error( 'bbp_topic_blacklist', __( 'ERROR: Your topic cannot be edited at this time.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_blacklist', __( 'Your topic cannot be edited at this time.', 'bbpress' ) ); } /** Topic Status **********************************************************/ @@ -713,7 +713,7 @@ } else { $append_error = ( is_wp_error( $topic_id ) && $topic_id->get_error_message() ) ? $topic_id->get_error_message() . ' ' : ''; - bbp_add_error( 'bbp_topic_error', __( 'ERROR: The following problem(s) have been found with your topic:' . $append_error . 'Please try again.', 'bbpress' ) ); + bbp_add_error( 'bbp_topic_error', __( 'The following problem(s) have been found with your topic:' . $append_error . 'Please try again.', 'bbpress' ) ); } } @@ -1067,25 +1067,25 @@ // Topic id if ( empty( $_POST['bbp_topic_id'] ) ) { - bbp_add_error( 'bbp_merge_topic_source_id', __( 'ERROR: Topic ID not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_merge_topic_source_id', __( 'Topic ID not found.', 'bbpress' ) ); } else { $source_topic_id = (int) $_POST['bbp_topic_id']; } // Nonce check if ( ! bbp_verify_nonce_request( 'bbp-merge-topic_' . $source_topic_id ) ) { - bbp_add_error( 'bbp_merge_topic_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_merge_topic_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; // Source topic not found } elseif ( ! $source_topic = bbp_get_topic( $source_topic_id ) ) { - bbp_add_error( 'bbp_merge_topic_source_not_found', __( 'ERROR: The topic you want to merge was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_merge_topic_source_not_found', __( 'The topic you want to merge was not found.', 'bbpress' ) ); return; } // Cannot edit source topic if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) { - bbp_add_error( 'bbp_merge_topic_source_permission', __( 'ERROR: You do not have permission to edit the source topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_merge_topic_source_permission', __( 'You do not have permission to edit the source topic.', 'bbpress' ) ); return; } @@ -1093,19 +1093,19 @@ // Topic id if ( empty( $_POST['bbp_destination_topic'] ) ) { - bbp_add_error( 'bbp_merge_topic_destination_id', __( 'ERROR: Destination topic ID not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_merge_topic_destination_id', __( 'Destination topic ID not found.', 'bbpress' ) ); } else { $destination_topic_id = (int) $_POST['bbp_destination_topic']; } // Destination topic not found if ( ! $destination_topic = bbp_get_topic( $destination_topic_id ) ) { - bbp_add_error( 'bbp_merge_topic_destination_not_found', __( 'ERROR: The topic you want to merge to was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_merge_topic_destination_not_found', __( 'The topic you want to merge to was not found.', 'bbpress' ) ); } // Cannot edit destination topic if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) { - bbp_add_error( 'bbp_merge_topic_destination_permission', __( 'ERROR: You do not have permission to edit the destination topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_merge_topic_destination_permission', __( 'You do not have permission to edit the destination topic.', 'bbpress' ) ); } // Bail if errors @@ -1325,7 +1325,7 @@ /** Split Reply ***********************************************************/ if ( empty( $_POST['bbp_reply_id'] ) ) { - bbp_add_error( 'bbp_split_topic_reply_id', __( 'ERROR: A reply ID is required.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_reply_id', __( 'A reply ID is required.', 'bbpress' ) ); } else { $from_reply_id = (int) $_POST['bbp_reply_id']; } @@ -1334,7 +1334,7 @@ // Reply exists if ( empty( $from_reply ) ) { - bbp_add_error( 'bbp_split_topic_r_not_found', __( 'ERROR: The reply you want to split from was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_r_not_found', __( 'The reply you want to split from was not found.', 'bbpress' ) ); } /** Topic to Split ********************************************************/ @@ -1344,18 +1344,18 @@ // No topic if ( empty( $source_topic ) ) { - bbp_add_error( 'bbp_split_topic_source_not_found', __( 'ERROR: The topic you want to split was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_source_not_found', __( 'The topic you want to split was not found.', 'bbpress' ) ); } // Nonce check failed if ( ! bbp_verify_nonce_request( 'bbp-split-topic_' . $source_topic->ID ) ) { - bbp_add_error( 'bbp_split_topic_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Use cannot edit topic if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) { - bbp_add_error( 'bbp_split_topic_source_permission', __( 'ERROR: You do not have permission to edit the source topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_source_permission', __( 'You do not have permission to edit the source topic.', 'bbpress' ) ); } // How to Split @@ -1365,7 +1365,7 @@ // Invalid split option if ( empty( $split_option ) || ! in_array( $split_option, array( 'existing', 'reply' ), true ) ) { - bbp_add_error( 'bbp_split_topic_option', __( 'ERROR: You need to choose a valid split option.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_option', __( 'You need to choose a valid split option.', 'bbpress' ) ); // Valid Split Option } else { @@ -1378,7 +1378,7 @@ // Get destination topic id if ( empty( $_POST['bbp_destination_topic'] ) ) { - bbp_add_error( 'bbp_split_topic_destination_id', __( 'ERROR: A topic ID is required.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_destination_id', __( 'A topic ID is required.', 'bbpress' ) ); } else { $destination_topic_id = (int) $_POST['bbp_destination_topic']; } @@ -1388,12 +1388,12 @@ // No destination topic if ( empty( $destination_topic ) ) { - bbp_add_error( 'bbp_split_topic_destination_not_found', __( 'ERROR: The topic you want to split to was not found.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_destination_not_found', __( 'The topic you want to split to was not found.', 'bbpress' ) ); } // User cannot edit the destination topic if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) { - bbp_add_error( 'bbp_split_topic_destination_permission', __( 'ERROR: You do not have permission to edit the destination topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_destination_permission', __( 'You do not have permission to edit the destination topic.', 'bbpress' ) ); } break; @@ -1431,12 +1431,12 @@ // Shouldn't happen if ( false === $destination_topic_id || is_wp_error( $destination_topic_id ) || empty( $destination_topic ) ) { - bbp_add_error( 'bbp_split_topic_destination_reply', __( 'ERROR: There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_destination_reply', __( 'There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) ); } // User cannot publish posts } else { - bbp_add_error( 'bbp_split_topic_destination_permission', __( 'ERROR: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_split_topic_destination_permission', __( 'You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) ); } break; @@ -1673,7 +1673,7 @@ // Tag does not exist if ( is_wp_error( $tag ) && $tag->get_error_message() ) { - bbp_add_error( 'bbp_manage_topic_invalid_tag', sprintf( __( 'ERROR: The following problem(s) have been found while getting the tag: %s', 'bbpress' ), $tag->get_error_message() ) ); + bbp_add_error( 'bbp_manage_topic_invalid_tag', sprintf( __( 'The following problem(s) have been found while getting the tag: %s', 'bbpress' ), $tag->get_error_message() ) ); return; } @@ -1685,19 +1685,19 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'update-tag_' . $tag_id ) ) { - bbp_add_error( 'bbp_manage_topic_tag_update_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_update_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Can user edit topic tags? if ( ! current_user_can( 'edit_topic_tag', $tag_id ) ) { - bbp_add_error( 'bbp_manage_topic_tag_update_permission', __( 'ERROR: You do not have permission to edit the topic tags.', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_update_permission', __( 'You do not have permission to edit the topic tags.', 'bbpress' ) ); return; } // No tag name was provided if ( empty( $_POST['tag-name'] ) || ! $name = $_POST['tag-name'] ) { - bbp_add_error( 'bbp_manage_topic_tag_update_name', __( 'ERROR: You need to enter a tag name.', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_update_name', __( 'You need to enter a tag name.', 'bbpress' ) ); return; } @@ -1712,7 +1712,7 @@ // Cannot update tag if ( is_wp_error( $tag ) && $tag->get_error_message() ) { - bbp_add_error( 'bbp_manage_topic_tag_update_error', sprintf( __( 'ERROR: The following problem(s) have been found while updating the tag: %s', 'bbpress' ), $tag->get_error_message() ) ); + bbp_add_error( 'bbp_manage_topic_tag_update_error', sprintf( __( 'The following problem(s) have been found while updating the tag: %s', 'bbpress' ), $tag->get_error_message() ) ); return; } @@ -1729,19 +1729,19 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'merge-tag_' . $tag_id ) ) { - bbp_add_error( 'bbp_manage_topic_tag_merge_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_merge_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Can user edit topic tags? if ( ! current_user_can( 'edit_topic_tags' ) ) { - bbp_add_error( 'bbp_manage_topic_tag_merge_permission', __( 'ERROR: You do not have permission to edit the topic tags.', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_merge_permission', __( 'You do not have permission to edit the topic tags.', 'bbpress' ) ); return; } // No tag name was provided if ( empty( $_POST['tag-existing-name'] ) || ! $name = $_POST['tag-existing-name'] ) { - bbp_add_error( 'bbp_manage_topic_tag_merge_name', __( 'ERROR: You need to enter a tag name.', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_merge_name', __( 'You need to enter a tag name.', 'bbpress' ) ); return; } @@ -1752,7 +1752,7 @@ // Problem inserting the new term if ( is_wp_error( $tag ) && $tag->get_error_message() ) { - bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( 'ERROR: The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) ); + bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( 'The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) ); return; } @@ -1761,7 +1761,7 @@ // Attempting to merge a tag into itself if ( $tag_id === $to_tag ) { - bbp_add_error( 'bbp_manage_topic_tag_merge_same', __( 'ERROR: The tags which are being merged can not be the same.', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_merge_same', __( 'The tags which are being merged can not be the same.', 'bbpress' ) ); return; } @@ -1773,7 +1773,7 @@ // Error merging the terms if ( is_wp_error( $tag ) && $tag->get_error_message() ) { - bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( 'ERROR: The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) ); + bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( 'The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) ); return; } @@ -1790,13 +1790,13 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'delete-tag_' . $tag_id ) ) { - bbp_add_error( 'bbp_manage_topic_tag_delete_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_delete_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Can user delete topic tags? if ( ! current_user_can( 'delete_topic_tag', $tag_id ) ) { - bbp_add_error( 'bbp_manage_topic_tag_delete_permission', __( 'ERROR: You do not have permission to delete the topic tags.', 'bbpress' ) ); + bbp_add_error( 'bbp_manage_topic_tag_delete_permission', __( 'You do not have permission to delete the topic tags.', 'bbpress' ) ); return; } @@ -1805,7 +1805,7 @@ // Error deleting term if ( is_wp_error( $tag ) && $tag->get_error_message() ) { - bbp_add_error( 'bbp_manage_topic_tag_delete_error', sprintf( __( 'ERROR: The following problem(s) have been found while deleting the tag: %s', 'bbpress' ), $tag->get_error_message() ) ); + bbp_add_error( 'bbp_manage_topic_tag_delete_error', sprintf( __( 'The following problem(s) have been found while deleting the tag: %s', 'bbpress' ), $tag->get_error_message() ) ); return; } @@ -1966,13 +1966,13 @@ // Make sure topic exists $topic = bbp_get_topic( $topic_id ); if ( empty( $topic ) ) { - bbp_add_error( 'bbp_toggle_topic_missing', __( 'ERROR: This topic could not be found or no longer exists.', 'bbpress' ) ); + bbp_add_error( 'bbp_toggle_topic_missing', __( 'This topic could not be found or no longer exists.', 'bbpress' ) ); return; } // What is the user doing here? if ( ! current_user_can( 'edit_topic', $topic_id ) || ( 'bbp_toggle_topic_trash' === $action && ! current_user_can( 'delete_topic', $topic_id ) ) ) { - bbp_add_error( 'bbp_toggle_topic_permission', __( 'ERROR: You do not have permission to do that.', 'bbpress' ) ); + bbp_add_error( 'bbp_toggle_topic_permission', __( 'You do not have permission to do that.', 'bbpress' ) ); return; } @@ -2056,8 +2056,8 @@ // Feedback $retval['message'] = ( true === $is_pending ) - ? __( 'ERROR: There was a problem approving the topic.', 'bbpress' ) - : __( 'ERROR: There was a problem unapproving the topic.', 'bbpress' ); + ? __( 'There was a problem approving the topic.', 'bbpress' ) + : __( 'There was a problem unapproving the topic.', 'bbpress' ); break; @@ -2074,8 +2074,8 @@ // Feedback $retval['message'] = ( true === $is_open ) - ? __( 'ERROR: There was a problem closing the topic.', 'bbpress' ) - : __( 'ERROR: There was a problem opening the topic.', 'bbpress' ); + ? __( 'There was a problem closing the topic.', 'bbpress' ) + : __( 'There was a problem opening the topic.', 'bbpress' ); break; @@ -2093,8 +2093,8 @@ // Feedback $retval['message'] = ( true === $is_sticky ) - ? __( 'ERROR: There was a problem unsticking the topic.', 'bbpress' ) - : __( 'ERROR: There was a problem sticking the topic.', 'bbpress' ); + ? __( 'There was a problem unsticking the topic.', 'bbpress' ) + : __( 'There was a problem sticking the topic.', 'bbpress' ); break; @@ -2112,8 +2112,8 @@ // Feedback $retval['message'] = ( true === $is_spam ) - ? __( 'ERROR: There was a problem unmarking the topic as spam.', 'bbpress' ) - : __( 'ERROR: There was a problem marking the topic as spam.', 'bbpress' ); + ? __( 'There was a problem unmarking the topic as spam.', 'bbpress' ) + : __( 'There was a problem marking the topic as spam.', 'bbpress' ); break; @@ -2126,7 +2126,7 @@ $retval['view_all'] = true; $retval['status'] = wp_trash_post( $r['id'] ); - $retval['message'] = __( 'ERROR: There was a problem trashing the topic.', 'bbpress' ); + $retval['message'] = __( 'There was a problem trashing the topic.', 'bbpress' ); $retval['redirect_to'] = current_user_can( 'view_trash' ) ? bbp_get_topic_permalink( $r['id'] ) : bbp_get_forum_permalink( bbp_get_topic_forum_id( $r['id'] ) ); @@ -2137,7 +2137,7 @@ check_ajax_referer( "untrash-{$nonce_suffix}" ); $retval['status'] = wp_untrash_post( $r['id'] ); - $retval['message'] = __( 'ERROR: There was a problem untrashing the topic.', 'bbpress' ); + $retval['message'] = __( 'There was a problem untrashing the topic.', 'bbpress' ); $retval['redirect_to'] = bbp_get_topic_permalink( $r['id'] ); break; @@ -2146,7 +2146,7 @@ check_ajax_referer( "delete-{$nonce_suffix}" ); $retval['status'] = wp_delete_post( $r['id'] ); - $retval['message'] = __( 'ERROR: There was a problem deleting the topic.', 'bbpress' ); + $retval['message'] = __( 'There was a problem deleting the topic.', 'bbpress' ); $retval['redirect_to'] = bbp_get_forum_permalink( $retval['status']->post_parent ); break; Index: src/includes/users/engagements.php --- src/includes/users/engagements.php +++ src/includes/users/engagements.php @@ -597,15 +597,15 @@ // Check for empty topic if ( empty( $topic_id ) ) { - bbp_add_error( 'bbp_favorite_topic_id', __( 'ERROR: No topic was found. Which topic are you marking/unmarking as favorite?', 'bbpress' ) ); + bbp_add_error( 'bbp_favorite_topic_id', __( 'No topic was found. Which topic are you marking/unmarking as favorite?', 'bbpress' ) ); // Check nonce } elseif ( ! bbp_verify_nonce_request( 'toggle-favorite_' . $topic_id ) ) { - bbp_add_error( 'bbp_favorite_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_favorite_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); // Check current user's ability to edit the user } elseif ( ! current_user_can( 'edit_user', $user_id ) ) { - bbp_add_error( 'bbp_favorite_permission', __( 'ERROR: You do not have permission to edit favorites for that user!.', 'bbpress' ) ); + bbp_add_error( 'bbp_favorite_permission', __( 'You do not have permission to edit favorites for that user!.', 'bbpress' ) ); } // Bail if errors @@ -646,9 +646,9 @@ // Fail! Handle errors } elseif ( 'bbp_favorite_remove' === $action ) { - bbp_add_error( 'bbp_favorite_remove', __( 'ERROR: There was a problem removing that topic from favorites.', 'bbpress' ) ); + bbp_add_error( 'bbp_favorite_remove', __( 'There was a problem removing that topic from favorites.', 'bbpress' ) ); } elseif ( 'bbp_favorite_add' === $action ) { - bbp_add_error( 'bbp_favorite_add', __( 'ERROR: There was a problem favoriting that topic.', 'bbpress' ) ); + bbp_add_error( 'bbp_favorite_add', __( 'There was a problem favoriting that topic.', 'bbpress' ) ); } return (bool) $success; @@ -834,15 +834,15 @@ // Check for empty topic if ( empty( $object_id ) ) { - bbp_add_error( 'bbp_subscription_object_id', __( 'ERROR: Not found. What are you subscribing/unsubscribing to?', 'bbpress' ) ); + bbp_add_error( 'bbp_subscription_object_id', __( 'Not found. What are you subscribing/unsubscribing to?', 'bbpress' ) ); // Check nonce } elseif ( ! bbp_verify_nonce_request( 'toggle-subscription_' . $object_id ) ) { - bbp_add_error( 'bbp_subscription_object_id', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_subscription_object_id', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); // Check current user's ability to edit the user } elseif ( ! current_user_can( 'edit_user', $user_id ) ) { - bbp_add_error( 'bbp_subscription_permission', __( 'ERROR: You do not have permission to edit subscriptions of that user.', 'bbpress' ) ); + bbp_add_error( 'bbp_subscription_permission', __( 'You do not have permission to edit subscriptions of that user.', 'bbpress' ) ); } // Bail if we have errors @@ -885,9 +885,9 @@ // Fail! Handle errors } elseif ( 'bbp_unsubscribe' === $action ) { - bbp_add_error( 'bbp_unsubscribe', __( 'ERROR: There was a problem unsubscribing.', 'bbpress' ) ); + bbp_add_error( 'bbp_unsubscribe', __( 'There was a problem unsubscribing.', 'bbpress' ) ); } elseif ( 'bbp_subscribe' === $action ) { - bbp_add_error( 'bbp_subscribe', __( 'ERROR: There was a problem subscribing.', 'bbpress' ) ); + bbp_add_error( 'bbp_subscribe', __( 'There was a problem subscribing.', 'bbpress' ) ); } return (bool) $success; Index: src/includes/users/functions.php --- src/includes/users/functions.php +++ src/includes/users/functions.php @@ -193,19 +193,19 @@ // Nonce check if ( ! bbp_verify_nonce_request( 'update-user_' . $user_id ) ) { - bbp_add_error( 'bbp_update_user_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_update_user_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Cap check if ( ! current_user_can( 'edit_user', $user_id ) ) { - bbp_add_error( 'bbp_update_user_capability', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_update_user_capability', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } // Empty email check if ( empty( $_POST['email'] ) ) { - bbp_add_error( 'bbp_user_email_empty', __( 'ERROR: That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) ); + bbp_add_error( 'bbp_user_email_empty', __( 'That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) ); return; } @@ -217,13 +217,13 @@ // Check that new email address is valid if ( ! is_email( $_POST['email'] ) ) { - bbp_add_error( 'bbp_user_email_invalid', __( 'ERROR: That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) ); + bbp_add_error( 'bbp_user_email_invalid', __( 'That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) ); return; } // Check if email address is already in use if ( email_exists( $_POST['email'] ) ) { - bbp_add_error( 'bbp_user_email_taken', __( 'ERROR: That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) ); + bbp_add_error( 'bbp_user_email_taken', __( 'That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) ); return; } @@ -342,7 +342,7 @@ if ( email_exists( $new_email['newemail'] ) ) { delete_option( $key ); - bbp_add_error( 'bbp_user_email_taken', __( 'ERROR: That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) ); + bbp_add_error( 'bbp_user_email_taken', __( 'That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) ); // Email address is good to change to } else { @@ -379,7 +379,7 @@ // Delete new email address from user options } elseif ( ! empty( $_GET['dismiss'] ) && ( $key === $_GET['dismiss'] ) ) { if ( ! bbp_verify_nonce_request( "dismiss-{$key}" ) ) { - bbp_add_error( 'bbp_dismiss_new_email_nonce', __( 'ERROR: Are you sure you wanted to do that?', 'bbpress' ) ); + bbp_add_error( 'bbp_dismiss_new_email_nonce', __( 'Are you sure you wanted to do that?', 'bbpress' ) ); return; } @@ -405,7 +405,7 @@ // Bail if any relevant parameters are empty if ( empty( $user_id ) || empty( $r['hash'] ) || empty( $r['newemail'] ) ) { - bbp_add_error( 'bbp_user_email_invalid_hash', __( 'ERROR: An error occurred while updating your email address.', 'bbpress' ), array( 'form-field' => 'email' ) ); + bbp_add_error( 'bbp_user_email_invalid_hash', __( 'An error occurred while updating your email address.', 'bbpress' ), array( 'form-field' => 'email' ) ); return; } Index: src/includes/users/template.php --- src/includes/users/template.php +++ src/includes/users/template.php @@ -1821,11 +1821,11 @@ // loggedout was passed if ( ! empty( $_GET['loggedout'] ) && ( true === $_GET['loggedout'] ) ) { - bbp_add_error( 'loggedout', esc_html__( 'You are now logged out.', 'bbpress' ), 'message' ); + bbp_add_notice( 'loggedout', esc_html__( 'You are now logged out.', 'bbpress' ), 'message' ); // registration is disabled } elseif ( ! empty( $_GET['registration'] ) && ( 'disabled' === $_GET['registration'] ) ) { - bbp_add_error( 'registerdisabled', esc_html__( 'New user registration is currently not allowed.', 'bbpress' ) ); + bbp_add_notice( 'registerdisabled', esc_html__( 'New user registration is currently not allowed.', 'bbpress' ) ); // Prompt user to check their email } elseif ( ! empty( $_GET['checkemail'] ) && in_array( $_GET['checkemail'], array( 'confirm', 'newpass', 'registered' ), true ) ) { @@ -1834,17 +1834,17 @@ // Email needs confirmation case 'confirm' : - bbp_add_error( 'confirm', esc_html__( 'Check your e-mail for the confirmation link.', 'bbpress' ), 'message' ); + bbp_add_notice( 'confirm', esc_html__( 'Check your e-mail for the confirmation link.', 'bbpress' ), 'message' ); break; // User requested a new password case 'newpass' : - bbp_add_error( 'newpass', esc_html__( 'Check your e-mail for your new password.', 'bbpress' ), 'message' ); + bbp_add_notice( 'newpass', esc_html__( 'Check your e-mail for your new password.', 'bbpress' ), 'message' ); break; // User is newly registered case 'registered' : - bbp_add_error( 'registered', esc_html__( 'Registration complete. Please check your e-mail.', 'bbpress' ), 'message' ); + bbp_add_notice( 'registered', esc_html__( 'Registration complete. Please check your e-mail.', 'bbpress' ), 'message' ); break; } }