Welcome User Email in Multisite Can't Be Changed

[Ipstenu]

Reproduced this on 3.3 and 3.4-aortic.

Go to /wp-admin/network/settings.php

Add 'New' to the sentance 'Welcome User' to make it 'Welcome New User'

Hit update.

Page refreshes, text does not change.

Isn't it 'Dear User'? ​http://core.trac.wordpress.org/browser/trunk/wp-admin/includes/ms.php#L213

Tested in 3.3 and current trunk, works in both.

It's 'Dear User' indeed, but I guess Ipstenu refers to welcome_user_email option:
​http://core.trac.wordpress.org/browser/tags/3.3.1/wp-includes/ms-functions.php#L1897

I can reproduce the bug in trunk. Seems introduced in [18588].

Since default welcome_user_email is implemented via a filter, update_site_option() doesn't call add_site_option() and then fails to update a non-existing option.

We should get rid of welcome_user_msg_filter() and make welcome_user_email a proper option, like welcome_email.

Erf, yeah, Dear User, but that's what I meant. Sorry, trying to do trac and give directions on the phone is a bad idea.

I think we could drop the ms-functions.php changes in the 3.3 branch. However, let's not remove a function entirely in case someone is using it. (In a branch, keep as is, I'd say.)

Replying to nacin:

However, let's not remove a function entirely in case someone is using it.

20116.2.patch​ moves welcome_user_msg_filter() to ms-deprecated.php.

So I finally looked at the root issue. The option does not exist, but when update_site_option() calls get_site_option(), it is told that it has a value, thanks to the filter. So instead of passing things off to add_site_option() to do an insert, it does an update, and there's now row with that option name to update.

That is lame, and affects get_option/update_option as well. I think we need *option_exists() methods in the future as a way to skip the filters in get_*.

Regardless, I came up with a targeted fix for the 3.3 branch. Attached.

In [20543]:

Rolling upgrade to set the welcome_user_email network-wide option via the welcome_user_msg_filter() callback. Fixes ability to save the welcome user email when no entry exists in the database. see #20116 for the 3.3 branch.

For trunk, I'd like to go along with something like 20116.2.diff. However, populate_network() only runs when the network is initially created. We should add some code to upgrade_network().

Since this is going to mean we are repeating this email three times, maybe we can just repurpose welcome_user_msg_filter(). Make $text default to false and then welcome_user_msg_filter() can just give us our email content. Perhaps too hacky, but it's an idea.

Replying to nacin:

However, populate_network() only runs when the network is initially created. We should add some code to upgrade_network().

Yeah, I forgot that without adding the option, the textarea on Network Settings screen would be empty, although wpmu_welcome_user_notification() would still get the proper text.

Make $text default to false and then welcome_user_msg_filter() can just give us our email content.

Done in 20116.3.patch​.

Per bug scrub, port [20543] to trunk and punt anything that remains.

In [20697]:

Rolling upgrade to set the welcome_user_email network-wide option via the welcome_user_msg_filter() callback. Fixes ability to save the welcome user email when no entry exists in the database. see #20116

What's left for this?

This is working on trunk right now. This can be closed unless someone else finds a problem.