From d33dda0bbb97cb35d5c060f690d976e3a28f6670 Mon Sep 17 00:00:00 2001 From: michelvaldrighi Date: Thu, 1 Jan 2004 19:09:15 +0000 Subject: [PATCH] take request_uri from http_server_vars, to be safe git-svn-id: http://svn.automattic.com/wordpress/trunk@676 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index 252dfb4715..e050efa6ea 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -21,7 +21,7 @@ define('WPINC', 'wp-includes'); require (ABSPATH . WPINC . '/wp-db.php'); $wpdb->hide_errors(); -if (!$wpdb->get_row("SELECT * FROM $tableoptions LIMIT 1") && !strstr($REQUEST_URI, 'install.php')) { +if (!$wpdb->get_row("SELECT * FROM $tableoptions LIMIT 1") && !strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'install.php')) { die("It doesn't look like you've installed WP yet. Try running install.php."); } $wpdb->show_errors(); @@ -41,7 +41,7 @@ require (ABSPATH . WPINC . '/kses.php'); // We should eventually migrate to either calling // get_settings() wherever these are needed OR // accessing a single global $all_settings var -if (!strstr($REQUEST_URI, 'install.php')) { +if (!strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'install.php')) { $siteurl = get_settings('siteurl'); // "When trying to design a foolproof system, // never underestimate the ingenuity of the fools :)"