Having fix not chagning `elgg_echo` is obviously better. I don't know how you managed to avoid undefined site_id problem. Anyway if it works with simpler fix, it's better.