From cf9f85dc8121a359d550ffa3b735fb48859eee88 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 24 Apr 2008 11:45:39 +0000
Subject: Merged with WP 2.5, revision 7806

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1260 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/query.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'wp-includes/query.php')

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 5837578..4ec272b 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -519,6 +519,7 @@ class WP_Query {
 		$qv['day'] = (int) $qv['day'];
 		$qv['w'] = (int) $qv['w'];
 		$qv['m'] =  (int) $qv['m'];
+		$qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
 		if ( '' !== $qv['hour'] ) $qv['hour'] = (int) $qv['hour'];
 		if ( '' !== $qv['minute'] ) $qv['minute'] = (int) $qv['minute'];
 		if ( '' !== $qv['second'] ) $qv['second'] = (int) $qv['second'];
@@ -1249,6 +1250,7 @@ class WP_Query {
 				$orderby = $orderby_array[$i];
 				switch ($orderby) {
 					case 'menu_order':
+						break;
 					case 'ID':
 						$orderby = "$wpdb->posts.ID";
 						break;
-- 
cgit