From a431376de5578d5aaf7a24f08ca9c85a53e89aa3 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Fri, 31 Jul 2009 22:22:54 +0000 Subject: [PATCH] Be consistent about slashing _REQUEST superglobal. props dd32. fixes #10360 git-svn-id: http://svn.automattic.com/wordpress/trunk@11760 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index ba7b9ec524..f7bd003b9a 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -47,9 +47,6 @@ wp_unregister_GLOBALS(); unset( $wp_filter, $cache_lastcommentmodified, $cache_lastpostdate ); -// Force REQUEST to be GET + POST. If SERVER, COOKIE, or ENV are needed, use those superglobals directly. -$_REQUEST = array_merge($_GET, $_POST); - /** * The $blog_id global, which you can change in the config allows you to create a simple * multiple blog installation using just one WordPress and changing $blog_id around. @@ -605,6 +602,9 @@ $_POST = add_magic_quotes($_POST ); $_COOKIE = add_magic_quotes($_COOKIE); $_SERVER = add_magic_quotes($_SERVER); +// Force REQUEST to be GET + POST. If SERVER, COOKIE, or ENV are needed, use those superglobals directly. +$_REQUEST = array_merge($_GET, $_POST); + do_action('sanitize_comment_cookies'); /**