Relocate revoke_super_admin() and grant_super_admin() to capabilities.php

[johnjamesjacoby]

Would be nice to move revoke_super_admin() and grant_super_admin() out of /wp-admin/includes/ms.php and into to /wp-includes/capabilities.php, where the rest of the _super_admin() functions are.

This allows theme-side user profile plugins (see: the bb's) to use these functions without needing to pull in a wp-admin file directly.

[nacin]

Should probably be moved to ms-functions.php, or be made non-multisite aware (in which case they wouldn't do anything). I'm okay with this but it was nice to have these in the admin only, I guess to avoid people shooting themselves in the foot. wp_delete_user() and wpmu_delete_user() are similarly in the admin.

[johnjamesjacoby]

Same with:

• update_user_status()
• refresh_user_details() (not used anywhere in core.)
• upload_is_user_over_quota() (Would prevent function exists check in class-wp-importer.php.)

[johnjamesjacoby]

Bumping to 4.1 to be reconsidered in conjunction with other multisite code changes.

[ocean90]

It's a bit late to move some code around, should be done early in a cycle.

[johnjamesjacoby]

Replying to ocean90:

It's a bit late to move some code around, should be done early in a cycle.

This was opened 6 releases ago, and moved 4 weeks ago (2 weeks before beta.)

What's the sweet spot to get this done without being noisy about it?

[jeremyfelt]

We can get this one in early. :)

[jeremyfelt]

Replying to jeremyfelt:

We can get this one in early. :)

My bad. :(

4.6 it is and I'm adding early to it / writing it on my board. :)

[jeremyfelt]

21788.diff​ is a refresh against current trunk. It also adds an is_multisite() check to immediately bail if used for single site.

[johnjamesjacoby]

Nice! Interesting catch with the is_multisite() additions.

These functions conveniently use the _site_option() functions, which technically do work on single-site, so I don't know that adding is_multisite() is necessary necessary, but I suppose probably wise.

Patch applies cleanly.

[jeremyfelt]

Replying to johnjamesjacoby:

These functions conveniently use the _site_option() functions, which technically do work on single-site, so I don't know that adding is_multisite() is necessary necessary, but I suppose probably wise.

Yeah, it seems like a good idea to move the functions first before thinking about whether support for grant/revoke should be added to single site.

[jeremyfelt]

In 37200:

Multisite: Relocate revoke_super_admin() and grant_super_admin()

Moving these functions to wp-includes/capabilities.php allows plugins to access more than just is_super_admin() and get_super_admin() from the front end without including a file via wp-admin/. Add an is_multisite() check to prevent use of these on single site environments now that they have left ms.php..

Props johnjamesjacoby.
Fixes #21788.