Ticket #6772: 6772-absint.diff

wp-includes/query.php

@@ -515 +515 @@
-                if ( ! empty($qv['robots']) )
-                        $this->is_robots = true;
-
-(int) $qv['p']
-(int) $qv['page_id']
-(int) $qv['year']
-(int) $qv['monthnum']
-(int) $qv['day']
-(int) $qv['w']
- (int) $qv['m']
+absint($qv['p'])
+absint($qv['page_id'])
+absint($qv['year'])
+absint($qv['monthnum'])
+absint($qv['day'])
+absint($qv['w'])
+absint($qv['m'])
-                $qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
-(int) $qv['hour']
-(int) $qv['minute']
-(int) $qv['second']
+absint($qv['hour'])
+absint($qv['minute'])
+absint($qv['second'])
-
-                // Compat.  Map subpost to attachment.
-                if ( '' != $qv['subpost'] )
@@ -533 +533 @@
-                if ( '' != $qv['subpost_id'] )
-                        $qv['attachment_id'] = $qv['subpost_id'];
-
-(int) $qv['attachment_id']
+absint($qv['attachment_id'])
-
-                if ( ('' != $qv['attachment']) || !empty($qv['attachment_id']) ) {
-                        $this->is_single = true;
@@ -624 +624 @@
-                        if ( !is_array($qv['category__in']) || empty($qv['category__in']) ) {
-                                $qv['category__in'] = array();
-                        } else {
-intval
+absint
-                                $this->is_category = true;
-                        }
-
-                        if ( !is_array($qv['category__not_in']) || empty($qv['category__not_in']) ) {
-                                $qv['category__not_in'] = array();
-                        } else {
-intval
+absint
-                        }
-
-                        if ( !is_array($qv['category__and']) || empty($qv['category__and']) ) {
-                                $qv['category__and'] = array();
-                        } else {
-intval
+absint
-                                $this->is_category = true;
-                        }
-
-                        if (  '' != $qv['tag'] )
-                                $this->is_tag = true;
-
-(int) $qv['tag_id']
+absint($qv['tag_id'])
-                        if (  !empty($qv['tag_id']) )
-                                $this->is_tag = true;
-
-                        if ( !is_array($qv['tag__in']) || empty($qv['tag__in']) ) {
-                                $qv['tag__in'] = array();
-                        } else {
-intval
+absint
-                                $this->is_tag = true;
-                        }
-
-                        if ( !is_array($qv['tag__not_in']) || empty($qv['tag__not_in']) ) {
-                                $qv['tag__not_in'] = array();
-                        } else {
-intval
+absint
-                        }
-
-                        if ( !is_array($qv['tag__and']) || empty($qv['tag__and']) ) {
-                                $qv['tag__and'] = array();
-                        } else {
-intval
+absint
-                                $this->is_category = true;
-                        }
-
@@ -871 +871 @@
-
-                if (isset($q['page'])) {
-                        $q['page'] = trim($q['page'], '/');
-
-
+
-                }
-
-                // If a month is specified in the querystring, load that month
@@ -949 +948 @@
-                        $where .= " AND WEEK($wpdb->posts.post_date, 1)='" . $q['w'] . "'";
-
-                if ( intval($q['comments_popup']) )
-intval
+absint
-
-                // If an attachment is requested by number, let it supercede any post number.
-                if ( $q['attachment_id'] )
-$q['attachment_id']
+absint($q['attachment_id'])
-
-                // If a post number is specified, load that post
-                if ( $q['p'] )
-                        $where = " AND {$wpdb->posts}.ID = " . $q['p'];
-                elseif ( $q['post_parent'] ) 
-
+ 
-                elseif ( $q['post__in'] ) {
-$q['post__in']
+array_map( 'absint', $q['post__in'] )
-                        $where = " AND {$wpdb->posts}.ID IN ($post__in)";
-                } elseif ( $q['post__not_in'] ) {
-$q['post__not_in']
+array_map( 'absint', $q['post__not_in'] )
-                        $where = " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
-                }
-
@@ -1207 +1206 @@
-                                $eq = '!=';
-                                $andor = 'AND';
-                                $q['author'] = explode('-', $q['author']);
-.intval
+ . absint
-                        } else {
-                                $eq = '=';
-                                $andor = 'OR';
-                        }
-                        $author_array = preg_split('/[,\s]+/', $q['author']);
-intval
+absint
-                        for ($i = 1; $i < (count($author_array)); $i = $i + 1) {
-intval
+absint
-                        }
-                        $whichauthor .= ')';
-                }
@@ -1233 +1232 @@
-                        }
-                        $q['author_name'] = sanitize_title($q['author_name']);
-                        $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
-intval
+absint
-                }
-
-                // MIME-Type stuff for attachment browsing
@@ -1373 +1372 @@
-
-                        if ( empty($q['offset']) ) {
-                                $pgstrt = '';
-intval($page) -
+$page - 
-                                $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
-                        } else { // we're ignoring $page and using 'offset'
-                                $q['offset'] = absint($q['offset']);