Index: trunk/src/includes/topics/template.php
===================================================================
--- trunk/src/includes/topics/template.php	(revision 6826)
+++ trunk/src/includes/topics/template.php	(working copy)
@@ -3853,17 +3853,9 @@
 		} elseif ( bbp_is_topic_edit() || bbp_is_reply_edit() ) {
 
 			// Get current posts author
-			$post_author = bbp_get_global_post_field( 'post_author', 'raw' );
+			$post_author = (int) bbp_get_global_post_field( 'post_author', 'raw' );
+			$topic_subscribed = bbp_is_user_subscribed( $post_author, bbp_get_topic_id() );
 
-			// Post author is not the current user
-			if ( bbp_get_current_user_id() !== $post_author ) {
-				$topic_subscribed = bbp_is_user_subscribed( $post_author, bbp_get_topic_id() );
-
-			// Post author is the current user
-			} else {
-				$topic_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id(), bbp_get_topic_id() );
-			}
-
 		// Get current status
 		} elseif ( bbp_is_single_topic() ) {
 			$topic_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id(), bbp_get_topic_id() );
Index: trunk/src/includes/users/engagements.php
===================================================================
--- trunk/src/includes/users/engagements.php	(revision 6826)
+++ trunk/src/includes/users/engagements.php	(working copy)
@@ -137,7 +137,7 @@
  */
 function bbp_is_object_of_user( $object_id = 0, $user_id = 0, $rel_key = '', $rel_type = 'post' ) {
 	$user_ids = bbp_get_users_for_object( $object_id, $rel_key, $rel_type );
-	$retval   = is_numeric( array_search( $user_id, $user_ids, true ) );
+	$retval   = is_numeric( array_search( (int) $user_id, $user_ids, true ) );
 
 	// Filter & return
 	return (bool) apply_filters( 'bbp_is_object_of_user', $retval, $object_id, $user_id, $rel_key, $rel_type );
