Changeset 34912 for trunk/src/wp-includes/capabilities-functions.php

Timestamp:

10/07/2015 05:11:01 PM (9 years ago)

Author:

jeremyfelt

Message:

Revert [34778], continue using _site_option() for the current network.

The _network_option() parameter order will be changing to accept $network_id first. The _site_option() functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

File:

• trunk/src/wp-includes/capabilities-functions.php (modified) (3 diffs)

trunk/src/wp-includes/capabilities-functions.php

@@ -337 +337 @@
         if ( is_multisite() ) {
             // update_, install_, and delete_ are handled above with is_super_admin().
-            $menu_perms = get_network_option( 'menu_items', array() );
+            $menu_perms = get_site_option( 'menu_items', array() );
             if ( empty( $menu_perms['plugins'] ) )
                 $caps[] = 'manage_network_plugins';
@@ -353 +353 @@
         if ( !is_multisite() )
             $caps[] = $cap;
-        elseif ( is_super_admin( $user_id ) || get_network_option( 'add_new_users' ) )
+        elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
             $caps[] = $cap;
         else
@@ -579 +579 @@
         return $super_admins;
     else
-        return get_network_option( 'site_admins', array('admin') );
+        return get_site_option( 'site_admins', array('admin') );
 }