WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fine tune checking. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@1450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-06-30 21:54:10 +00:00
parent 8b44ee9d93
commit 78397fa62c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/functions.php
View File

@ -287,13 +287,14 @@ function url_to_postid($url = '') {
function get_settings($setting) { function get_settings($setting) {
global $wpdb, $cache_settings; 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; return false;
if ( empty($cache_settings) ) if ( empty($cache_settings) )
$cache_settings = get_alloptions(); $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) ) if ( isset($cache_settings->$setting) )
return $cache_settings->$setting; return $cache_settings->$setting;