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

Reverse that cleanup, there is reason in the madness ;) 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2005-11-14 09:08:27 +00:00
parent 156c10fe85
commit 4f0edc7878
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/functions.php
View File

@ -267,15 +267,17 @@ function get_settings($setting) {
if ( false === $value ) { if ( false === $value ) {
if ( defined('WP_INSTALLING') ) if ( defined('WP_INSTALLING') )
$wpdb->hide_errors(); $wpdb->hide_errors();
$value = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1"); $row = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1");
if ( defined('WP_INSTALLING') ) if ( defined('WP_INSTALLING') )
$wpdb->show_errors(); $wpdb->show_errors();
if( $value ) if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
$value = $row->option_value;
wp_cache_set($setting, $value, 'options'); wp_cache_set($setting, $value, 'options');
else } else {
return false; return false;
} }
}
// If home is not set use siteurl. // If home is not set use siteurl.
if ( 'home' == $setting && '' == $value ) if ( 'home' == $setting && '' == $value )