From 8399b696d7660728535b85dbd90466f0e82e6fc8 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 27 Feb 2007 11:07:37 +0000
Subject: WP Merge to 4952

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

(limited to 'wp-includes')

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 9155b9b..19eaa81 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -957,6 +957,7 @@ function bool_from_yn($yn) {
 
 function do_feed() {
 	global $wp_query;
+
 	$feed = get_query_var('feed');
 
 	// Remove the pad, if present.
@@ -1305,7 +1306,7 @@ function wp_nonce_ays($action) {
 		$html .= "\t\t<input type='hidden' name='_wpnonce' value='" . wp_create_nonce($action) . "' />\n";
 		$html .= "\t\t<div id='message' class='confirm fade'>\n\t\t<p>" . wp_specialchars(wp_explain_nonce($action)) . "</p>\n\t\t<p><a href='$adminurl'>" . __('No') . "</a> <input type='submit' value='" . __('Yes') . "' /></p>\n\t\t</div>\n\t</form>\n";
 	} else {
-		$html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . wp_specialchars(wp_explain_nonce($action)) . "</p>\n\t<p><a href='$adminurl'>" . __('No') . "</a> <a href='" . add_query_arg( '_wpnonce', wp_create_nonce($action), $_SERVER['REQUEST_URI'] ) . "'>" . __('Yes') . "</a></p>\n\t</div>\n";
+		$html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . wp_specialchars(wp_explain_nonce($action)) . "</p>\n\t<p><a href='$adminurl'>" . __('No') . "</a> <a href='" . attribute_escape(add_query_arg( '_wpnonce', wp_create_nonce($action), $_SERVER['REQUEST_URI'] )) . "'>" . __('Yes') . "</a></p>\n\t</div>\n";
 	}
 	$html .= "</body>\n</html>";
 	wp_die($html, $title);
-- 
cgit