<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14515] trunk/wp-includes/functions.php:
consistency & simplicity in get_option(), see #12140</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14515">14515</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-08 18:05:16 +0000 (Sat, 08 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>consistency & simplicity in get_option(), see <a href="http://trac.wordpress.org/ticket/12140">#12140</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (14514 => 14515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-05-08 15:43:00 UTC (rev 14514)
+++ trunk/wp-includes/functions.php 2010-05-08 18:05:16 UTC (rev 14515)
</span><span class="lines">@@ -310,42 +310,41 @@
</span><span class="cx"> if ( defined( 'WP_SETUP_CONFIG' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // prevent non-existent options from triggering multiple queries
- if ( defined( 'WP_INSTALLING' ) && is_multisite() ) {
- $notoptions = array();
- } else {
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ // prevent non-existent options from triggering multiple queries
</ins><span class="cx"> $notoptions = wp_cache_get( 'notoptions', 'options' );
</span><span class="cx"> if ( isset( $notoptions[$option] ) )
</span><span class="cx"> return $default;
</span><del>- }
</del><span class="cx">
</span><del>- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><span class="cx"> $alloptions = wp_load_alloptions();
</span><del>- }
</del><span class="cx">
</span><del>- if ( isset( $alloptions[$option] ) ) {
- $value = $alloptions[$option];
- } else {
- $value = wp_cache_get( $option, 'options' );
</del><ins>+ if ( isset( $alloptions[$option] ) ) {
+ $value = $alloptions[$option];
+ } else {
+ $value = wp_cache_get( $option, 'options' );
</ins><span class="cx">
</span><del>- if ( false === $value ) {
- if ( defined( 'WP_INSTALLING' ) )
- $suppress = $wpdb->suppress_errors();
- $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
- if ( defined( 'WP_INSTALLING' ) )
- $wpdb->suppress_errors( $suppress );
</del><ins>+ if ( false === $value ) {
+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
</ins><span class="cx">
</span><del>- // Has to be get_row instead of get_var because of funkiness with 0, false, null values
- if ( is_object( $row ) ) {
- $value = $row->option_value;
- if ( ! defined( 'WP_INSTALLING' ) )
</del><ins>+ // Has to be get_row instead of get_var because of funkiness with 0, false, null values
+ if ( is_object( $row ) ) {
+ $value = $row->option_value;
</ins><span class="cx"> wp_cache_add( $option, $value, 'options' );
</span><del>- } else { // option does not exist, so we must cache its non-existence
- $notoptions[$option] = true;
- wp_cache_set( 'notoptions', $notoptions, 'options' );
- return $default;
</del><ins>+ } else { // option does not exist, so we must cache its non-existence
+ $notoptions[$option] = true;
+ wp_cache_set( 'notoptions', $notoptions, 'options' );
+ return $default;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ } else {
+ $suppress = $wpdb->suppress_errors();
+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
+ $wpdb->suppress_errors( $suppress );
+ if ( is_object( $row ) )
+ $value = $row->option_value;
+ else
+ return $default;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If home is not set use siteurl.
</span></span></pre>
</div>
</div>
</body>
</html>