vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create a function, wp_roles(), to DRY the inline instantiation of the $wp_roles global.

Browse Source 
Add missing doc blocks for `capabilities.php`.

See #32444.


git-svn-id: https://develop.svn.wordpress.org/trunk@32541 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2015-05-22 04:46:36 +00:00
parent 0864ba691a
commit 7a683940d7
2 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wp-includes/user.php
View File

@@ -1334,7 +1334,7 @@ function update_user_meta($user_id, $meta_key, $meta_value, $prev_value = '') {
* @return array Includes a grand total and an array of counts indexed by role strings.
*/
function count_users($strategy = 'time') {
global $wpdb, $wp_roles;
global $wpdb;
// Initialize
$id = get_current_blog_id();
@@ -1342,12 +1342,7 @@ function count_users($strategy = 'time') {
$result = array();
if ( 'time' == $strategy ) {
global $wp_roles;
if ( ! isset( $wp_roles ) )
$wp_roles = new WP_Roles();
$avail_roles = $wp_roles->get_names();
$avail_roles = wp_roles()->get_names();
// Build a CPU-intensive query that will return concise information.
$select_count = array();