golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass default value to get_option(), fixes #7637 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-08-29 07:25:45 +00:00
parent 3c1095b79c
commit 5f476b32f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/functions.php
View File

@ -330,7 +330,7 @@ function is_serialized_string( $data ) {
* @param string $setting Name of option to retrieve. Should already be SQL-escaped
* @return mixed Value set for the option.
*/
function get_option( $setting ) {
function get_option( $setting, $default = false ) {
global $wpdb;
// Allow plugins to short-circuit options.
@ -341,7 +341,7 @@ function get_option( $setting ) {
// prevent non-existent options from triggering multiple queries
$notoptions = wp_cache_get( 'notoptions', 'options' );
if ( isset( $notoptions[$setting] ) )
return false;
return $default;
$alloptions = wp_load_alloptions();
@ -364,7 +364,7 @@ function get_option( $setting ) {
} else { // option does not exist, so we must cache its non-existence
$notoptions[$setting] = true;
wp_cache_set( 'notoptions', $notoptions, 'options' );
return false;
return $default;
}
}
}