Changeset 2295 for trunk/wp-includes/classes.php

Timestamp:

02/13/2005 05:52:58 PM (22 years ago)

Author:

rboren

Message:

Allow category and date filtering to coincide. Allow any number of spaces or commas to serve as item separators in the category and author arrays. ​http://mosquito.wordpress.org/view.php?id=221

File:

• trunk/wp-includes/classes.php (modified) (3 diffs)

trunk/wp-includes/classes.php

@@ -354 +354 @@
                 if ((empty($q['cat'])) || ($q['cat'] == '0') || 
                                 // Bypass cat checks if fetching specific posts
-                                (
-                                 intval($q['year']) || intval($q['monthnum']) || intval($q['day']) || intval($q['w']) ||
-                                 intval($q['p']) || !empty($q['name']) || !empty($q['s'])
-                                 )
-                                ) {
+                                ( is_single() || is_page() )) {
                         $whichcat='';
                 } else {
@@ -376 +372 @@
                         }
                         $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) ";
-                        $cat_array = explode(' ',$q['cat']);
+                        $cat_array = preg_split('/[,\s]+/', $q['cat']);
                         $whichcat .= ' AND (category_id '.$eq.' '.intval($cat_array[0]);
                         $whichcat .= get_category_children($cat_array[0], ' '.$andor.' category_id '.$eq.' ');
@@ -425 +421 @@
                                 $andor = 'OR';
                         }
-                        $author_array = explode(' ', $q['author']);
+                        $author_array = preg_split('/[,\s]+/', $q['author']);
                         $whichauthor .= ' AND (post_author '.$eq.' '.intval($author_array[0]);
                         for ($i = 1; $i < (count($author_array)); $i = $i + 1) {