we should never use $RESUEST_URI, but access it with $_SERVER
git-svn-id: http://svn.automattic.com/wordpress/trunk@845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c26991b1d1
commit
2055a5905d
|
@ -549,8 +549,10 @@ function url_to_postid($url = '') {
|
||||||
/* Options functions */
|
/* Options functions */
|
||||||
|
|
||||||
function get_settings($setting) {
|
function get_settings($setting) {
|
||||||
global $wpdb, $cache_settings, $use_cache, $REQUEST_URI;
|
global $wpdb, $cache_settings, $use_cache;
|
||||||
if (strstr($REQUEST_URI, 'install.php')) return false;
|
if (strstr($_SERVER['REQUEST_URI'], 'install.php')) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if ((empty($cache_settings)) OR (!$use_cache)) {
|
if ((empty($cache_settings)) OR (!$use_cache)) {
|
||||||
$settings = get_alloptions();
|
$settings = get_alloptions();
|
||||||
$cache_settings = $settings;
|
$cache_settings = $settings;
|
||||||
|
|
Loading…
Reference in New Issue