Sponsor Invoices: "paid" emails are coming from multiple sites

[Varantain]

This is from the context of a Sponsor Wrangler, as I haven't had the chance to test it as a Sponsor.

Sponsor "approved" emails (which happen when an invoice is sent to a sponsor) come from wordpress@wordcamp.org, but "paid" emails (which happen when the invoice is marked as paid) come from many different email addresses.

For the Singapore camp this year, I have seen emails arrive from wordpress@2017.lehighvalley.wordcamp.org, wordpress@2017.brisbane.wordcamp.org and wordpress@central.wordcamp.org.

[SergeyBiryukov]

Could be unrelated, but I've noticed that notify_organizer_status_changed() calls switch_to_blog() and then returns without calling restore_current_blog() if $new_status is neither approved nor paid.

I've looked through all switch_to_blog() calls in WordCamp.org plugins and haven't noticed any other instances not followed by restore_current_blog() at a glance.

[iandunn]

In 6052:

WordCamp Budgets Dashboard: Restore current blog before returning early.

See #3190
Props SergeyBiryukov

[iandunn]

Thanks @SergeyBiryukov :)

I don't think [6052] will fix the issue, because I'm not seeing that function ever get called without a status without a valid $new_status. The return there is just a way to be extra careful. It's still correct to have the restore_current_blog() there, though.

wp_mail() uses $_SERVER['SERVER_NAME'] to set the From address, which wouldn't be affected by switch_to_blog(). I wonder if that's the cause? If so, we could probably just fix that by setting it in $headers.

[iandunn]

#2895 was marked as a duplicate.

[iandunn]

#2895 has some potentially useful info.

[iandunn]

Fixed in ​a406f370