WP Merge to rev 4753

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@849 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 4 insertions, 2 deletions

diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 62cee05..47470d3 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -224,6 +224,8 @@ class WP {
 		foreach (array_keys($this->query_vars) as $wpvar) {
 			if ( '' != $this->query_vars[$wpvar] ) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
+				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+					continue;
 				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
@@ -498,10 +500,10 @@ class Walker_Page extends Walker {
 		return $output;
 	}
 
-	function start_el($output, $page, $depth, $current_page, $show_date, $date_format) {
+	function start_el($output, $page, $depth, $current_page, $args) {
 		if ( $depth )
 			$indent = str_repeat("\t", $depth);
-
+		extract($args);
 		$css_class = 'page_item';
 		$_current_page = get_page( $current_page );
 		if ( $page->ID == $current_page )