Minileven: add options back as they still exist on sites

[jeherve]

Changes proposed in this Pull Request:

This is a follow-up to #14714.
After removing those options, we started seeing errors like this one on sites:
PHP Warning: Invalid Jetpack option name: wp_mobile_excerpt

Since these Jetpack options are still valid options even if the feature is gone, let's keep them around.

Testing instructions:

• Start from a site running Jetpack stable.
• with the Beta plugin, switch from stable to this branch.
• You should see no notices.

Proposed changelog entry for your changes:

• N/A

[jetpackbot]

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Scheduled Jetpack release: March 3, 2020.
Scheduled code freeze: February 25, 2020

Generated by 🚫 dangerJS against 0060167

[roccotripaldi]

Following your testing instructions, I did get a bunch of notices:

Warning: Invalid Jetpack option name: wp_mobile_excerpt in /srv/users/user116b676c/apps/user116b676c/public/wp-content/plugins/jetpack-dev/vendor/automattic/jetpack-options/legacy/class-jetpack-options.php on line 189

Warning: Invalid Jetpack option name: wp_mobile_featured_images in /srv/users/user116b676c/apps/user116b676c/public/wp-content/plugins/jetpack-dev/vendor/automattic/jetpack-options/legacy/class-jetpack-options.php on line 189

Warning: Invalid Jetpack option name: wp_mobile_app_promos in /srv/users/user116b676c/apps/user116b676c/public/wp-content/plugins/jetpack-dev/vendor/automattic/jetpack-options/legacy/class-jetpack-options.php on line 189

[kbrown9]

It looks like the problem is that the three wp_mobile_* options that we delete aren’t managed by Jetpack_Options. So, Jetpack_Options::get_option() doesn’t recognize them as valid option names.

These options were originally in the array returned by Jetpack_Options::get_all_wp_options() The options in that array aren’t managed by Jetpack_Options.

I think we need to call core’s get_option() and delete_option() functions to get and delete these options in Jetpack::plugin_upgrade().

[jeherve]

Thank you. That makes sense now, I was confused. I updated the calls, this should be ready for another review now.

[kraftbj]

As discussed in Slack, we need to take into account the spun-out plugin so need to gate this to only delete options if the plugin is not active.

[jeherve]

we need to take into account the spun-out plugin so need to gate this to only delete options if the plugin is not active.

I gave this a try in 0060167. Let me know if this is what you had in mind!

[kbrown9]

This looks good to me! The PHP warnings are no longer generated.

Changes were addressed