take request_uri from http_server_vars, to be safe
git-svn-id: https://develop.svn.wordpress.org/trunk@676 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
78eff94e5d
commit
15b2fd0fb0
@ -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 <a href='wp-admin/install.php'>install.php</a>.");
|
||||
}
|
||||
$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 :)"
|
||||
|
Loading…
Reference in New Issue
Block a user