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

Timestamp:

06/24/2010 03:01:29 PM (16 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-admin/includes/ms.php (modified) (12 diffs)

trunk/wp-admin/includes/ms.php

@@ -179 +179 @@
 
 function confirm_delete_users( $users ) {
-        global $current_user;
+        $current_user = wp_get_current_user();
         if ( !is_array( $users ) )
                 return false;
 
-    screen_icon();
-    ?>
+        screen_icon();
+        ?>
         <h2><?php esc_html_e( 'Users' ); ?></h2>
         <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p>
         <form action="ms-edit.php?action=dodelete" method="post">
         <input type="hidden" name="dodelete" />
-    <?php
+        <?php
         wp_nonce_field( 'ms-users-delete' );
         $site_admins = get_super_admins();
@@ -312 +312 @@
 
 function send_confirmation_on_profile_email() {
-        global $errors, $wpdb, $current_user;
+        global $errors, $wpdb;
+        $current_user = wp_get_current_user();
         if ( ! is_object($errors) )
                 $errors = new WP_Error();
@@ -365 +366 @@
 
 function new_user_email_admin_notice() {
-        global $current_user;
-        if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( $current_user->ID . '_new_email' ) )
+        if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) )
                 echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
 }
@@ -599 +599 @@
 
 function redirect_user_to_blog() {
-        global $current_user;
         $c = 0;
         if ( isset( $_GET['c'] ) )
@@ -609 +608 @@
         $c ++;
 
-        $blog = get_active_blog_for_user( $current_user->ID );
+        $blog = get_active_blog_for_user( get_current_user_id() );
         $dashboard_blog = get_dashboard_blog();
         if ( is_object( $blog ) ) {
@@ -620 +619 @@
            then update the primary_blog record to match the user's blog
          */
-        $blogs = get_blogs_of_user( $current_user->ID );
+        $blogs = get_blogs_of_user( get_current_user_id() );
 
         if ( !empty( $blogs ) ) {
                 foreach( $blogs as $blogid => $blog ) {
-                        if ( $blogid != $dashboard_blog->blog_id && get_user_meta( $current_user->ID , 'primary_blog', true ) == $dashboard_blog->blog_id ) {
-                                update_user_meta( $current_user->ID, 'primary_blog', $blogid );
+                        if ( $blogid != $dashboard_blog->blog_id && get_user_meta( get_current_user_id() , 'primary_blog', true ) == $dashboard_blog->blog_id ) {
+                                update_user_meta( get_current_user_id(), 'primary_blog', $blogid );
                                 continue;
                         }
                 }
-                $blog = get_blog_details( get_user_meta( $current_user->ID, 'primary_blog', true ) );
+                $blog = get_blog_details( get_user_meta( get_current_user_id(), 'primary_blog', true ) );
                         wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) );
                 exit;
@@ -698 +697 @@
 
 function admin_notice_feed() {
-        global $current_user, $current_screen;
+        global $current_screen;
         if ( $current_screen->id != 'dashboard' )
                 return;
 
         if ( !empty( $_GET['feed_dismiss'] ) ) {
-                update_user_option( $current_user->id, 'admin_feed_dismiss', $_GET['feed_dismiss'], true );
+                update_user_option( get_current_user_id(), 'admin_feed_dismiss', $_GET['feed_dismiss'], true );
                 return;
         }
@@ -729 +728 @@
 
 function site_admin_notice() {
-        global $current_user, $wp_db_version;
+        global $wp_db_version;
         if ( !is_super_admin() )
                 return false;
@@ -761 +760 @@
 
 function choose_primary_blog() {
-        global $current_user;
         ?>
         <table class="form-table">
@@ -769 +767 @@
                 <td>
                 <?php
-                $all_blogs = get_blogs_of_user( $current_user->ID );
-                $primary_blog = get_user_meta( $current_user->ID, 'primary_blog', true );
+                $all_blogs = get_blogs_of_user( get_current_user_id() );
+                $primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );
                 if ( count( $all_blogs ) > 1 ) {
                         $found = false;
@@ -784 +782 @@
                         if ( !$found ) {
                                 $blog = array_shift( $all_blogs );
-                                update_user_meta( $current_user->ID, 'primary_blog', $blog->userblog_id );
+                                update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
                         }
                 } elseif ( count( $all_blogs ) == 1 ) {
@@ -790 +788 @@
                         echo $blog->domain;
                         if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
-                                update_user_meta( $current_user->ID, 'primary_blog', $blog->userblog_id );
+                                update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
                 } else {
                         echo "N/A";