From e1b81babffbef3fd4f9f4cc046e64e3d52402acd Mon Sep 17 00:00:00 2001 From: Matt Mullenweg Date: Mon, 14 Nov 2005 08:51:04 +0000 Subject: [PATCH] Small cleanup git-svn-id: https://develop.svn.wordpress.org/trunk@3068 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/functions.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 756d173a9a..9a85d299cc 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -267,16 +267,14 @@ function get_settings($setting) { if ( false === $value ) { if ( defined('WP_INSTALLING') ) $wpdb->hide_errors(); - $value = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'"); + $value = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1"); if ( defined('WP_INSTALLING') ) $wpdb->show_errors(); - if( is_object( $value ) ) { - $value = $value->option_value; + if( $value ) wp_cache_set($setting, $value, 'options'); - } else { + else return false; - } } // If home is not set use siteurl.