Changeset 15452 for branches/3.0/wp-admin/includes/post.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/post.php (modified) (4 diffs)

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

@@ -1173 +1173 @@
  */
 function wp_check_post_lock( $post_id ) {
-    global $current_user;
-
     if ( !$post = get_post( $post_id ) )
         return false;
@@ -1183 +1181 @@
     $time_window = apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 );
 
-    if ( $lock && $lock > time() - $time_window && $last != $current_user->ID )
+    if ( $lock && $lock > time() - $time_window && $last != get_current_user_id() )
         return $last;
     return false;
@@ -1197 +1195 @@
  */
 function wp_set_post_lock( $post_id ) {
-    global $current_user;
     if ( !$post = get_post( $post_id ) )
         return false;
-    if ( !$current_user || !$current_user->ID )
+    if ( 0 == get_current_user_id() )
         return false;
 
@@ -1255 +1252 @@
         $new_autosave = _wp_post_revision_fields( $_POST, true );
         $new_autosave['ID'] = $old_autosave->ID;
-        $current_user = wp_get_current_user();
-        $new_autosave['post_author'] = $current_user->ID;
+        $new_autosave['post_author'] = get_current_user_id();
         return wp_update_post( $new_autosave );
     }