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

Timestamp:

10/02/2013 09:09:52 PM (13 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/query.php (modified) (5 diffs)

trunk/src/wp-includes/query.php

@@ -2141 +2141 @@
          */
         function get_posts() {
-                global $wpdb, $user_ID;
+                global $wpdb;
 
                 $this->parse_query();
@@ -2714 +2714 @@
                         }
 
+                        $user_id = get_current_user_id();
+
                         if ( !empty($e_status) ) {
                                 $statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
@@ -2719 +2721 @@
                         if ( !empty($r_status) ) {
                                 if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
-                                        $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))";
+                                        $statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
                                 else
                                         $statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
@@ -2725 +2727 @@
                         if ( !empty($p_status) ) {
                                 if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) )
-                                        $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))";
+                                        $statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
                                 else
                                         $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
@@ -2758 +2760 @@
                                 $private_states = get_post_stati( array('private' => true) );
                                 foreach ( (array) $private_states as $state )
-                                        $where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_ID AND $wpdb->posts.post_status = '$state'";
+                                        $where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
                         }