Changeset 15315 for trunk/wp-admin/includes/template.php
- Timestamp:
- 06/24/2010 03:01:29 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/template.php
r15280 r15315 848 848 */ 849 849 function inline_edit_row( $screen ) { 850 global $ current_user, $mode;850 global $mode; 851 851 852 852 if ( is_string($screen) ) { … … 929 929 930 930 if ( post_type_supports( $screen->post_type, 'author' ) ) : 931 $authors = get_editable_user_ids( $current_user->id, true, $screen->post_type ); // TODO: ROLE SYSTEM931 $authors = get_editable_user_ids( get_current_user_id(), true, $screen->post_type ); // TODO: ROLE SYSTEM 932 932 $authors_dropdown = ''; 933 933 if ( $authors && count( $authors ) > 1 ) : … … 1269 1269 */ 1270 1270 function _post_row($a_post, $pending_comments, $mode) { 1271 global $post, $current_ user, $current_screen;1271 global $post, $current_screen; 1272 1272 static $rowclass; 1273 1273 … … 1277 1277 1278 1278 $rowclass = 'alternate' == $rowclass ? '' : 'alternate'; 1279 $post_owner = ( $current_user->ID== $post->post_author ? 'self' : 'other' );1279 $post_owner = ( get_current_user_id() == $post->post_author ? 'self' : 'other' ); 1280 1280 $edit_link = get_edit_post_link( $post->ID ); 1281 1281 $title = _draft_or_post_title(); … … 1795 1795 global $wp_roles; 1796 1796 1797 $current_user = wp_get_current_user();1798 1799 1797 if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) ) 1800 1798 $user_object = new WP_User( (int) $user_object ); … … 1813 1811 // Set up the user editing link 1814 1812 // TODO: make profile/user-edit determination a separate function 1815 if ( $current_user->ID== $user_object->ID) {1813 if ( get_current_user_id() == $user_object->ID) { 1816 1814 $edit_link = 'profile.php'; 1817 1815 } else { … … 1830 1828 } 1831 1829 1832 if ( !is_multisite() && $current_user->ID!= $user_object->ID && current_user_can('delete_user', $user_object->ID) )1830 if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('delete_user', $user_object->ID) ) 1833 1831 $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . '</a>'; 1834 if ( is_multisite() && $current_user->ID!= $user_object->ID && current_user_can('remove_user', $user_object->ID) )1832 if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('remove_user', $user_object->ID) ) 1835 1833 $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=remove&user=$user_object->ID", 'bulk-users') . "'>" . __('Remove') . '</a>'; 1836 1834 $actions = apply_filters('user_row_actions', $actions, $user_object); … … 2225 2223 */ 2226 2224 function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) { 2227 global $current_user;2228 2229 2225 // allow plugin to replace the popup content 2230 2226 $content = apply_filters( 'wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode) ); … … 2278 2274 </p> 2279 2275 2280 <input type="hidden" name="user_ID" id="user_ID" value="<?php echo $current_user->ID; ?>" />2276 <input type="hidden" name="user_ID" id="user_ID" value="<?php echo get_current_user_id(); ?>" /> 2281 2277 <input type="hidden" name="action" id="action" value="" /> 2282 2278 <input type="hidden" name="comment_ID" id="comment_ID" value="" />
Note: See TracChangeset
for help on using the changeset viewer.