Changeset 15452 for branches/3.0/wp-admin/includes/template.php

Timestamp:

07/21/2010 08:10:22 PM (14 years ago)

Author:

ryan

Message:

Use get_current_user() and get_current_user_id() instead of global current_user object. Props filofo. fixes #13934 for 3.0.1

File:

• branches/3.0/wp-admin/includes/template.php (modified) (9 diffs)

branches/3.0/wp-admin/includes/template.php

@@ -848 +848 @@
  */
 function inline_edit_row( $screen ) {
-    global $current_user, $mode;
+    global $mode;
 
     if ( is_string($screen) ) {
@@ -929 +929 @@
 
     if ( post_type_supports( $screen->post_type, 'author' ) ) :
-        $authors = get_editable_user_ids( $current_user->id, true, $screen->post_type ); // TODO: ROLE SYSTEM
+        $authors = get_editable_user_ids( get_current_user_id(), true, $screen->post_type ); // TODO: ROLE SYSTEM
         $authors_dropdown = '';
         if ( $authors && count( $authors ) > 1 ) :
@@ -1270 +1270 @@
  */
 function _post_row($a_post, $pending_comments, $mode) {
-    global $post, $current_user, $current_screen;
+    global $post, $current_screen;
     static $rowclass;
 
@@ -1278 +1278 @@
 
     $rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-    $post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
+    $post_owner = ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
     $edit_link = get_edit_post_link( $post->ID );
     $title = _draft_or_post_title();
@@ -1796 +1796 @@
     global $wp_roles;
 
-    $current_user = wp_get_current_user();
-
     if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
         $user_object = new WP_User( (int) $user_object );
@@ -1814 +1812 @@
         // Set up the user editing link
         // TODO: make profile/user-edit determination a separate function
-        if ($current_user->ID == $user_object->ID) {
+        if ( get_current_user_id() == $user_object->ID) {
             $edit_link = 'profile.php';
         } else {
@@ -1831 +1829 @@
         }
 
-        if ( !is_multisite() && $current_user->ID != $user_object->ID && current_user_can('delete_user', $user_object->ID) )
+        if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('delete_user', $user_object->ID) )
             $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . "</a>";
-        if ( is_multisite() && $current_user->ID != $user_object->ID && current_user_can('remove_user', $user_object->ID) )
+        if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('remove_user', $user_object->ID) )
             $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=remove&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Remove') . "</a>";
         $actions = apply_filters('user_row_actions', $actions, $user_object);
@@ -2226 +2224 @@
  */
 function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) {
-    global $current_user;
-
     // allow plugin to replace the popup content
     $content = apply_filters( 'wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode) );
@@ -2279 +2275 @@
     </p>
 
-    <input type="hidden" name="user_ID" id="user_ID" value="<?php echo $current_user->ID; ?>" />
+    <input type="hidden" name="user_ID" id="user_ID" value="<?php echo get_current_user_id(); ?>" />
     <input type="hidden" name="action" id="action" value="" />
     <input type="hidden" name="comment_ID" id="comment_ID" value="" />