Ticket #21779: 21779.patch

wp-includes/query.php

@@ -1732 +1732 @@
                 if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
                         $q['cat'] = ''.urldecode($q['cat']).'';
                         $q['cat'] = addslashes_gpc($q['cat']);
-                        $cat_array = preg_split('/[,\s]+/', $q['cat']);
+                        $cat_array = preg_split('/[,\r\n\t ]+/', $q['cat']);
                         $q['cat'] = '';
                         $req_cats = array();
                         foreach ( (array) $cat_array as $cat ) {
@@ -1785 +1785 @@
                 // Tag stuff
                 if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
                         if ( strpos($q['tag'], ',') !== false ) {
-                                $tags = preg_split('/[,\s]+/', $q['tag']);
+                                $tags = preg_split('/[,\r\n\t ]+/', $q['tag']);
                                 foreach ( (array) $tags as $tag ) {
                                         $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
                                         $q['tag_slug__in'][] = $tag;
                                 }
-                        } else if ( preg_match('/[+\s]+/', $q['tag']) || !empty($q['cat']) ) {
-                                $tags = preg_split('/[+\s]+/', $q['tag']);
+                        } else if ( preg_match('/[+\r\n\t ]+/', $q['tag']) || !empty($q['cat']) ) {
+                                $tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
                                 foreach ( (array) $tags as $tag ) {
                                         $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
                                         $q['tag_slug__and'][] = $tag;
@@ -2285 +2285 @@
                                 $eq = '=';
                                 $andor = 'OR';
                         }
-                        $author_array = preg_split('/[,\s]+/', $q['author']);
+                        $author_array = preg_split('/[,\r\n\t ]+/', $q['author']);
                         $_author_array = array();
                         foreach ( $author_array as $key => $_author )
                                 $_author_array[] = "$wpdb->posts.post_author " . $eq . ' ' . absint($_author);