| 1 | Index: wp-includes/user.php |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- wp-includes/user.php (revision 19170) |
|---|
| 4 | +++ wp-includes/user.php (working copy) |
|---|
| 5 | @@ -652,6 +652,12 @@ |
|---|
| 6 | function get_blogs_of_user( $user_id, $all = false ) { |
|---|
| 7 | global $wpdb; |
|---|
| 8 | |
|---|
| 9 | + $user_id = (int) $user_id; |
|---|
| 10 | + |
|---|
| 11 | + // Logged out users can't have blogs |
|---|
| 12 | + if ( empty( $user_id ) ) |
|---|
| 13 | + return false; |
|---|
| 14 | + |
|---|
| 15 | if ( ! is_multisite() ) { |
|---|
| 16 | $blog_id = get_current_blog_id(); |
|---|
| 17 | $blogs = array( $blog_id => new stdClass ); |
|---|
| 18 | @@ -664,12 +670,6 @@ |
|---|
| 19 | return $blogs; |
|---|
| 20 | } |
|---|
| 21 | |
|---|
| 22 | - $user_id = (int) $user_id; |
|---|
| 23 | - |
|---|
| 24 | - // Logged out users can't have blogs |
|---|
| 25 | - if ( empty( $user_id ) ) |
|---|
| 26 | - return false; |
|---|
| 27 | - |
|---|
| 28 | $keys = get_user_meta( $user_id ); |
|---|
| 29 | if ( empty( $keys ) ) |
|---|
| 30 | return false; |
|---|
| 31 | @@ -736,10 +736,8 @@ |
|---|
| 32 | if ( empty( $user_id ) ) |
|---|
| 33 | $user_id = get_current_user_id(); |
|---|
| 34 | |
|---|
| 35 | - if ( empty( $blog_id ) ) { |
|---|
| 36 | - global $wpdb; |
|---|
| 37 | - $blog_id = $wpdb->blogid; |
|---|
| 38 | - } |
|---|
| 39 | + if ( empty( $blog_id ) ) |
|---|
| 40 | + $blog_id = get_current_blog_id(); |
|---|
| 41 | |
|---|
| 42 | $blogs = get_blogs_of_user( $user_id ); |
|---|
| 43 | if ( is_array( $blogs ) ) |
|---|
