From 78397fa62cca9a3ab8a85b74071288a92f8cb988 Mon Sep 17 00:00:00 2001 From: saxmatt Date: Wed, 30 Jun 2004 21:54:10 +0000 Subject: [PATCH] Fine tune checking. git-svn-id: http://svn.automattic.com/wordpress/trunk@1450 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 70460d865f..6502446175 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -287,13 +287,14 @@ function url_to_postid($url = '') { function get_settings($setting) { global $wpdb, $cache_settings; - if ( strstr($_SERVER['REQUEST_URI'], 'install.php') || strstr($_SERVER['REQUEST_URI'], 'upgrade.php') ) + if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || strstr($_SERVER['REQUEST_URI'], 'wp-admin/upgrade.php') ) return false; if ( empty($cache_settings) ) $cache_settings = get_alloptions(); - if ('home' == $setting && '' == $cache_settings->home) return $cache_settings->siteurl; + if ('home' == $setting && '' == $cache_settings->home) + return $cache_settings->siteurl; if ( isset($cache_settings->$setting) ) return $cache_settings->$setting;