Changeset 15315 for trunk/wp-includes/ms-functions.php

Timestamp:

06/24/2010 03:01:29 PM (15 years ago)

Author:

ryan

Message:

Use get_current_user() and get_current_user_id() instead of global . Props filofo. see #13934 for trunk

File:

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

trunk/wp-includes/ms-functions.php

@@ -373 +373 @@
 
 function is_blog_user( $blog_id = 0 ) {
-    global $current_user, $wpdb;
-
+    global $wpdb;
+ 
+    $current_user = wp_get_current_user();
     if ( !$blog_id )
         $blog_id = $wpdb->blogid;
@@ -1320 +1321 @@
 function is_user_spammy( $username = 0 ) {
     if ( $username == 0 ) {
-        global $current_user;
-        $user_id = $current_user->ID;
+        $user_id = get_current_user_id();
     } else {
         $user_id = get_user_id_from_string( $username );
@@ -1361 +1361 @@
 
 function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
-    global $current_user, $wpdb;
-
+    global $wpdb;
+
+    $current_user = wp_get_current_user();
     if ( $user_id == 0 )
         $user_id = $current_user->ID;