Changeset 25669 for trunk/src/wp-includes/post.php

Timestamp:

10/02/2013 09:09:52 PM (11 years ago)

Author:

ocean90

Message:

Replace use of global $user_ID in favor of get_current_user_id(). fixes #25372.

File:

• trunk/src/wp-includes/post.php (modified) (10 diffs)

trunk/src/wp-includes/post.php

@@ -2656 +2656 @@
  *
  * @global wpdb $wpdb    WordPress database abstraction object.
- * @global int  $user_ID
  *
  * @since 1.0.0
@@ -2667 +2666 @@
  *     @type string 'post_status'           The post status. Default 'draft'.
  *     @type string 'post_type'             The post type. Default 'post'.
- *     @type int    'post_author'           The ID of the user who added the post. Default $user_ID, the current user ID.
+ *     @type int    'post_author'           The ID of the user who added the post. Default the current user ID.
  *     @type bool   'ping_status'           Whether the post can accept pings. Default value of 'default_ping_status' option.
  *     @type int    'post_parent'           Set this for the post it belongs to, if any. Default 0.
@@ -2683 +2682 @@
  */
 function wp_insert_post( $postarr, $wp_error = false ) {
-    global $wpdb, $user_ID;
-
-    $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,
+    global $wpdb;
+
+    $user_id = get_current_user_id();
+
+    $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_id,
         'ping_status' => get_option('default_ping_status'), 'post_parent' => 0,
         'menu_order' => 0, 'to_ping' =>  '', 'pinged' => '', 'post_password' => '',
@@ -2750 +2751 @@
 
     if ( empty($post_author) )
-        $post_author = $user_ID;
+        $post_author = $user_id;
 
     // Don't allow contributors to set the post slug for pending review posts
@@ -3944 +3945 @@
  * @since 2.0.0
  * @uses $wpdb
- * @uses $user_ID
  * @uses do_action() Calls 'edit_attachment' on $post_ID if this is an update.
  * @uses do_action() Calls 'add_attachment' on $post_ID if this is not an update.
@@ -3954 +3954 @@
  */
 function wp_insert_attachment($object, $file = false, $parent = 0) {
-    global $wpdb, $user_ID;
-
-    $defaults = array('post_status' => 'inherit', 'post_type' => 'post', 'post_author' => $user_ID,
+    global $wpdb;
+
+    $user_id = get_current_user_id();
+
+    $defaults = array('post_status' => 'inherit', 'post_type' => 'post', 'post_author' => $user_id,
         'ping_status' => get_option('default_ping_status'), 'post_parent' => 0, 'post_title' => '',
         'menu_order' => 0, 'to_ping' =>  '', 'pinged' => '', 'post_password' => '', 'post_content' => '',
@@ -3973 +3975 @@
 
     if ( empty($post_author) )
-        $post_author = $user_ID;
+        $post_author = $user_id;
 
     $post_type = 'attachment';
@@ -4497 +4499 @@
  * @since 2.2.0
  *
- * @uses $user_ID
- *
  * @param string $post_type currently only supports 'post' or 'page'.
  * @return string SQL code that can be added to a where clause.
@@ -4519 +4519 @@
  */
 function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false ) {
-    global $user_ID, $wpdb;
+    global $wpdb;
 
     // Private posts
@@ -4549 +4549 @@
         } elseif ( is_user_logged_in() ) {
             // Users can view their own private posts.
-            $id = (int) $user_ID;
+            $id = get_current_user_id();
             if ( null === $post_author || ! $full ) {
                 $sql .= " OR post_status = 'private' AND post_author = $id";