Changes from branches/3.0/wp-admin/includes/ms.php at r15452 to trunk/wp-admin/includes/ms.php at r15228
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/ms.php
r15452 r15228 179 179 180 180 function confirm_delete_users( $users ) { 181 $current_user = wp_get_current_user();181 global $current_user; 182 182 if ( !is_array( $users ) ) 183 183 return false; 184 184 185 186 185 screen_icon(); 186 ?> 187 187 <h2><?php esc_html_e( 'Users' ); ?></h2> 188 188 <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p> 189 189 <form action="ms-edit.php?action=dodelete" method="post"> 190 190 <input type="hidden" name="dodelete" /> 191 191 <?php 192 192 wp_nonce_field( 'ms-users-delete' ); 193 193 $site_admins = get_super_admins(); … … 312 312 313 313 function send_confirmation_on_profile_email() { 314 global $errors, $wpdb; 315 $current_user = wp_get_current_user(); 314 global $errors, $wpdb, $current_user; 316 315 if ( ! is_object($errors) ) 317 316 $errors = new WP_Error(); … … 366 365 367 366 function new_user_email_admin_notice() { 368 if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) 367 global $current_user; 368 if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( $current_user->ID . '_new_email' ) ) 369 369 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>"; 370 370 } … … 599 599 600 600 function redirect_user_to_blog() { 601 global $current_user; 601 602 $c = 0; 602 603 if ( isset( $_GET['c'] ) ) … … 608 609 $c ++; 609 610 610 $blog = get_active_blog_for_user( get_current_user_id());611 $blog = get_active_blog_for_user( $current_user->ID ); 611 612 $dashboard_blog = get_dashboard_blog(); 612 613 if ( is_object( $blog ) ) { … … 619 620 then update the primary_blog record to match the user's blog 620 621 */ 621 $blogs = get_blogs_of_user( get_current_user_id());622 $blogs = get_blogs_of_user( $current_user->ID ); 622 623 623 624 if ( !empty( $blogs ) ) { 624 625 foreach( $blogs as $blogid => $blog ) { 625 if ( $blogid != $dashboard_blog->blog_id && get_user_meta( get_current_user_id(), 'primary_blog', true ) == $dashboard_blog->blog_id ) {626 update_user_meta( get_current_user_id(), 'primary_blog', $blogid );626 if ( $blogid != $dashboard_blog->blog_id && get_user_meta( $current_user->ID , 'primary_blog', true ) == $dashboard_blog->blog_id ) { 627 update_user_meta( $current_user->ID, 'primary_blog', $blogid ); 627 628 continue; 628 629 } 629 630 } 630 $blog = get_blog_details( get_user_meta( get_current_user_id(), 'primary_blog', true ) );631 $blog = get_blog_details( get_user_meta( $current_user->ID, 'primary_blog', true ) ); 631 632 wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) ); 632 633 exit; … … 654 655 $flag = true; 655 656 $ae = __( 'American English' ); 656 $output[$ae] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang , false) . '> ' . $ae . '</option>';657 $output[$ae] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang ) . '> ' . $ae . '</option>'; 657 658 } elseif ( $code_lang == 'en_GB' ) { // British English 658 659 $flag = true; 659 660 $be = __( 'British English' ); 660 $output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang , false) . '> ' . $be . '</option>';661 $output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang ) . '> ' . $be . '</option>'; 661 662 } else { 662 663 $translated = format_code_lang( $code_lang ); 663 $output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang , false) . '> ' . esc_html ( $translated ) . '</option>';664 $output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang ) . '> ' . esc_html ( $translated ) . '</option>'; 664 665 } 665 666 … … 667 668 668 669 if ( $flag === false ) // WordPress english 669 $output[] = '<option value=""' . selected( $current, '' , false) . '>' . __( 'English' ) . "</option>";670 $output[] = '<option value=""' . selected( $current, '' ) . '>' . __( 'English' ) . "</option>"; 670 671 671 672 // Order by name … … 697 698 698 699 function admin_notice_feed() { 699 global $current_ screen;700 global $current_user, $current_screen; 700 701 if ( $current_screen->id != 'dashboard' ) 701 702 return; 702 703 703 704 if ( !empty( $_GET['feed_dismiss'] ) ) { 704 update_user_option( get_current_user_id(), 'admin_feed_dismiss', $_GET['feed_dismiss'], true );705 update_user_option( $current_user->id, 'admin_feed_dismiss', $_GET['feed_dismiss'], true ); 705 706 return; 706 707 } … … 728 729 729 730 function site_admin_notice() { 730 global $ wp_db_version;731 global $current_user, $wp_db_version; 731 732 if ( !is_super_admin() ) 732 733 return false; … … 760 761 761 762 function choose_primary_blog() { 763 global $current_user; 762 764 ?> 763 765 <table class="form-table"> … … 767 769 <td> 768 770 <?php 769 $all_blogs = get_blogs_of_user( get_current_user_id());770 $primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );771 $all_blogs = get_blogs_of_user( $current_user->ID ); 772 $primary_blog = get_user_meta( $current_user->ID, 'primary_blog', true ); 771 773 if ( count( $all_blogs ) > 1 ) { 772 774 $found = false; … … 782 784 if ( !$found ) { 783 785 $blog = array_shift( $all_blogs ); 784 update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );786 update_user_meta( $current_user->ID, 'primary_blog', $blog->userblog_id ); 785 787 } 786 788 } elseif ( count( $all_blogs ) == 1 ) { … … 788 790 echo $blog->domain; 789 791 if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list. 790 update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );792 update_user_meta( $current_user->ID, 'primary_blog', $blog->userblog_id ); 791 793 } else { 792 794 echo "N/A";
Note: See TracChangeset
for help on using the changeset viewer.