BuddyPress.org

Glad it’s working for you now. Have fun. If I were you I’d replace those two files with the originals and wait for the official fix to come through. It may not look anything like the patch and could cause conflicts.