Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/ms.php

    r15452 r15228  
    179179
    180180function confirm_delete_users( $users ) {
    181     $current_user = wp_get_current_user();
     181    global $current_user;
    182182    if ( !is_array( $users ) )
    183183        return false;
    184184
    185     screen_icon();
    186     ?>
     185    screen_icon();
     186    ?>
    187187    <h2><?php esc_html_e( 'Users' ); ?></h2>
    188188    <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p>
    189189    <form action="ms-edit.php?action=dodelete" method="post">
    190190    <input type="hidden" name="dodelete" />
    191     <?php
     191    <?php
    192192    wp_nonce_field( 'ms-users-delete' );
    193193    $site_admins = get_super_admins();
     
    312312
    313313function send_confirmation_on_profile_email() {
    314     global $errors, $wpdb;
    315     $current_user = wp_get_current_user();
     314    global $errors, $wpdb, $current_user;
    316315    if ( ! is_object($errors) )
    317316        $errors = new WP_Error();
     
    366365
    367366function 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' ) )
    369369        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>";
    370370}
     
    599599
    600600function redirect_user_to_blog() {
     601    global $current_user;
    601602    $c = 0;
    602603    if ( isset( $_GET['c'] ) )
     
    608609    $c ++;
    609610
    610     $blog = get_active_blog_for_user( get_current_user_id() );
     611    $blog = get_active_blog_for_user( $current_user->ID );
    611612    $dashboard_blog = get_dashboard_blog();
    612613    if ( is_object( $blog ) ) {
     
    619620       then update the primary_blog record to match the user's blog
    620621     */
    621     $blogs = get_blogs_of_user( get_current_user_id() );
     622    $blogs = get_blogs_of_user( $current_user->ID );
    622623
    623624    if ( !empty( $blogs ) ) {
    624625        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 );
    627628                continue;
    628629            }
    629630        }
    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 ) );
    631632            wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) );
    632633        exit;
     
    654655            $flag = true;
    655656            $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>';
    657658        } elseif ( $code_lang == 'en_GB' ) { // British English
    658659            $flag = true;
    659660            $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>';
    661662        } else {
    662663            $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>';
    664665        }
    665666
     
    667668
    668669    if ( $flag === false ) // WordPress english
    669         $output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . "</option>";
     670        $output[] = '<option value=""' . selected( $current, '' ) . '>' . __( 'English' ) . "</option>";
    670671
    671672    // Order by name
     
    697698
    698699function admin_notice_feed() {
    699     global $current_screen;
     700    global $current_user, $current_screen;
    700701    if ( $current_screen->id != 'dashboard' )
    701702        return;
    702703
    703704    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 );
    705706        return;
    706707    }
     
    728729
    729730function site_admin_notice() {
    730     global $wp_db_version;
     731    global $current_user, $wp_db_version;
    731732    if ( !is_super_admin() )
    732733        return false;
     
    760761
    761762function choose_primary_blog() {
     763    global $current_user;
    762764    ?>
    763765    <table class="form-table">
     
    767769        <td>
    768770        <?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 );
    771773        if ( count( $all_blogs ) > 1 ) {
    772774            $found = false;
     
    782784            if ( !$found ) {
    783785                $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 );
    785787            }
    786788        } elseif ( count( $all_blogs ) == 1 ) {
     
    788790            echo $blog->domain;
    789791            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 );
    791793        } else {
    792794            echo "N/A";
Note: See TracChangeset for help on using the changeset viewer.