sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

take request_uri from http_server_vars, to be safe

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@676 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
michelvaldrighi 2004-01-01 19:09:15 +00:00
parent 78eff94e5d
commit 15b2fd0fb0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-settings.php
View File

@ -21,7 +21,7 @@ define('WPINC', 'wp-includes');
require (ABSPATH . WPINC . '/wp-db.php'); require (ABSPATH . WPINC . '/wp-db.php');
$wpdb->hide_errors(); $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>."); 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(); $wpdb->show_errors();
@ -41,7 +41,7 @@ require (ABSPATH . WPINC . '/kses.php');
// We should eventually migrate to either calling // We should eventually migrate to either calling
// get_settings() wherever these are needed OR // get_settings() wherever these are needed OR
// accessing a single global $all_settings var // 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'); $siteurl = get_settings('siteurl');
// "When trying to design a foolproof system, // "When trying to design a foolproof system,
// never underestimate the ingenuity of the fools :)" // never underestimate the ingenuity of the fools :)"