<!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" />
<title>[21414] trunk: Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21414">21414</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-08-03 17:51:42 +0000 (Fri, 03 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().
Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.
Group multiple operations within a single switch where possible.
fixes <a href="http://core.trac.wordpress.org/ticket/21432">#21432</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminnetworksiteinfophp">trunk/wp-admin/network/site-info.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminnetworkupgradephp">trunk/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunkwpincludesclasswpthemephp">trunk/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -230,8 +230,11 @@
</span><span class="cx"> echo "<td class='column-$column_name $column_name'$style>"; ?>
</span><span class="cx"> <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
</span><span class="cx"> <?php
</span><del>- if ( 'list' != $mode )
- echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s</em>', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '</p>';
</del><ins>+ if ( 'list' != $mode ) {
+ switch_to_blog( $blog['blog_id'] );
+ echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s</em>', '%1$s: site name. %2$s: site tagline.' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '</p>';
+ restore_current_blog();
+ }
</ins><span class="cx">
</span><span class="cx"> // Preordered.
</span><span class="cx"> $actions = array(
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-admin/includes/ms.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -411,7 +411,10 @@
</span><span class="cx">
</span><span class="cx"> // Edit blog upload space setting on Edit Blog page
</span><span class="cx"> function upload_space_setting( $id ) {
</span><del>- $quota = get_blog_option( $id, 'blog_upload_space' );
</del><ins>+ switch_to_blog( $id );
+ $quota = get_option( 'blog_upload_space' );
+ restore_current_blog();
+
</ins><span class="cx"> if ( !$quota )
</span><span class="cx"> $quota = '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-info.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-info.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-admin/network/site-info.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -135,10 +135,15 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Path' ) ?></th>
</span><span class="cx"> <?php if ( $is_main_site ) { ?>
</span><span class="cx"> <td><code><?php echo esc_attr( $details->path ) ?></code></td>
</span><del>- <?php } else { ?>
</del><ins>+ <?php
+ } else {
+ switch_to_blog( $id );
+ ?>
</ins><span class="cx"> <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style='margin-bottom:5px;' />
</span><del>- <br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php if ( get_blog_option( $id, 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_blog_option( $id, 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>
- <?php } ?>
</del><ins>+ <br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>
+ <?php
+ restore_current_blog();
+ } ?>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _ex( 'Registered', 'site' ) ?></th>
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-admin/network/site-users.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -45,33 +45,26 @@
</span><span class="cx"> wp_die( __('Invalid site ID.') );
</span><span class="cx">
</span><span class="cx"> $details = get_blog_details( $id );
</span><del>-if ( !can_edit_network( $details->site_id ) )
</del><ins>+if ( ! can_edit_network( $details->site_id ) )
</ins><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> $is_main_site = is_main_site( $id );
</span><span class="cx">
</span><del>-// get blog prefix
-$blog_prefix = $wpdb->get_blog_prefix( $id );
</del><ins>+switch_to_blog( $id );
</ins><span class="cx">
</span><del>-// @todo This is a hack. Eventually, add API to WP_Roles allowing retrieval of roles for a particular blog.
-if ( ! empty($wp_roles->use_db) ) {
- $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
-} else {
- // Roles are stored in memory, not the DB.
- $editblog_roles = $wp_roles->roles;
-}
-$default_role = get_blog_option( $id, 'default_role' );
</del><ins>+$editblog_roles = $wp_roles->roles;
</ins><span class="cx">
</span><ins>+$default_role = get_option( 'default_role' );
+
</ins><span class="cx"> $action = $wp_list_table->current_action();
</span><span class="cx">
</span><span class="cx"> if ( $action ) {
</span><del>- switch_to_blog( $id );
</del><span class="cx">
</span><span class="cx"> switch ( $action ) {
</span><span class="cx"> case 'newuser':
</span><span class="cx"> check_admin_referer( 'add-user', '_wpnonce_add-new-user' );
</span><span class="cx"> $user = $_POST['user'];
</span><del>- if ( !is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
</del><ins>+ if ( ! is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
</ins><span class="cx"> $update = 'err_new';
</span><span class="cx"> } else {
</span><span class="cx"> $password = wp_generate_password( 12, false);
</span><span class="lines">@@ -94,6 +87,7 @@
</span><span class="cx"> $newuser = $_POST['newuser'];
</span><span class="cx"> $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
</span><span class="cx"> if ( $userid ) {
</span><ins>+ $blog_prefix = $wpdb->get_blog_prefix( $id );
</ins><span class="cx"> $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" );
</span><span class="cx"> if ( $user == false )
</span><span class="cx"> add_user_to_blog( $id, $userid, $_POST['new_role'] );
</span><span class="lines">@@ -108,7 +102,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'remove':
</span><del>- if ( !current_user_can('remove_users') )
</del><ins>+ if ( ! current_user_can( 'remove_users' ) )
</ins><span class="cx"> die(__('You can&#8217;t remove users.'));
</span><span class="cx"> check_admin_referer( 'bulk-users' );
</span><span class="cx">
</span><span class="lines">@@ -152,11 +146,12 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- restore_current_blog();
</del><span class="cx"> wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+restore_current_blog();
+
</ins><span class="cx"> if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
</span><span class="cx"> wp_safe_redirect( $referer );
</span><span class="cx"> exit();
</span></span></pre></div>
<a id="trunkwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/upgrade.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/upgrade.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-admin/network/upgrade.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -60,9 +60,12 @@
</span><span class="cx"> }
</span><span class="cx"> echo "<ul>";
</span><span class="cx"> foreach ( (array) $blogs as $details ) {
</span><del>- $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
</del><ins>+ switch_to_blog( $details['blog_id'] );
+ $siteurl = site_url();
+ $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
+ restore_current_blog();
</ins><span class="cx"> echo "<li>$siteurl</li>";
</span><del>- $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=upgrade_db", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
</del><ins>+ $response = wp_remote_get( $upgrade_url, array( 'timeout' => 120, 'httpversion' => '1.1' ) );
</ins><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="cx"> wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: <em>%2$s</em>' ), $siteurl, $response->get_error_message() ) );
</span><span class="cx"> do_action( 'after_mu_upgrade', $response );
</span></span></pre></div>
<a id="trunkwpincludesclasswpthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-theme.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-theme.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-includes/class-wp-theme.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -1109,18 +1109,24 @@
</span><span class="cx">
</span><span class="cx"> $current = $blog_id == get_current_blog_id();
</span><span class="cx">
</span><del>- if ( $current )
</del><ins>+ if ( $current ) {
</ins><span class="cx"> $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
</span><del>- else
- $allowed_themes[ $blog_id ] = get_blog_option( $blog_id, 'allowedthemes' );
</del><ins>+ } else {
+ switch_to_blog( $blog_id );
+ $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+ restore_current_blog();
+ }
</ins><span class="cx">
</span><span class="cx"> // This is all super old MU back compat joy.
</span><span class="cx"> // 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
</span><span class="cx"> if ( false === $allowed_themes[ $blog_id ] ) {
</span><del>- if ( $current )
</del><ins>+ if ( $current ) {
</ins><span class="cx"> $allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
</span><del>- else
- $allowed_themes[ $blog_id ] = get_blog_option( $blog_id, 'allowed_themes' );
</del><ins>+ } else {
+ switch_to_blog( $blog_id );
+ $allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+ restore_current_blog();
+ }
</ins><span class="cx">
</span><span class="cx"> if ( ! is_array( $allowed_themes[ $blog_id ] ) || empty( $allowed_themes[ $blog_id ] ) ) {
</span><span class="cx"> $allowed_themes[ $blog_id ] = array();
</span><span class="lines">@@ -1139,8 +1145,10 @@
</span><span class="cx"> update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
</span><span class="cx"> delete_option( 'allowed_themes' );
</span><span class="cx"> } else {
</span><del>- update_blog_option( $blog_id, 'allowedthemes', $allowed_themes[ $blog_id ] );
- delete_blog_option( $blog_id, 'allowed_themes' );
</del><ins>+ switch_to_blog( $blog_id );
+ update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
+ delete_option( 'allowed_themes' );
+ restore_current_blog();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -475,13 +475,15 @@
</span><span class="cx"> $blog_id = $blog->userblog_id;
</span><span class="cx"> $is_admin = current_user_can_for_blog( $blog_id, 'manage_options' );
</span><span class="cx">
</span><ins>+ switch_to_blog( $blog_id );
</ins><span class="cx"> $struct[] = array(
</span><span class="cx"> 'isAdmin' => $is_admin,
</span><del>- 'url' => get_home_url( $blog_id, '/' ),
</del><ins>+ 'url' => home_url( '/' ),
</ins><span class="cx"> 'blogid' => (string) $blog_id,
</span><del>- 'blogName' => get_blog_option( $blog_id, 'blogname' ),
- 'xmlrpc' => get_site_url( $blog_id, 'xmlrpc.php' )
</del><ins>+ 'blogName' => get_option( 'blogname' ),
+ 'xmlrpc' => site_url( 'xmlrpc.php' )
</ins><span class="cx"> );
</span><ins>+ restore_current_blog();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $struct;
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-includes/link-template.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -1896,10 +1896,13 @@
</span><span class="cx"> if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
</span><span class="cx"> $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
</span><span class="cx">
</span><del>- if ( empty( $blog_id ) || !is_multisite() )
</del><ins>+ if ( empty( $blog_id ) || !is_multisite() ) {
</ins><span class="cx"> $url = get_option( 'home' );
</span><del>- else
- $url = get_blog_option( $blog_id, 'home' );
</del><ins>+ } else {
+ switch_to_blog( $blog_id );
+ $url = get_option( 'home' );
+ restore_current_blog();
+ }
</ins><span class="cx">
</span><span class="cx"> if ( 'relative' == $scheme )
</span><span class="cx"> $url = preg_replace( '#^.+://[^/]*#', '', $url );
</span><span class="lines">@@ -1961,10 +1964,13 @@
</span><span class="cx"> $scheme = ( is_ssl() ? 'https' : 'http' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $blog_id ) || !is_multisite() )
</del><ins>+ if ( empty( $blog_id ) || !is_multisite() ) {
</ins><span class="cx"> $url = get_option( 'siteurl' );
</span><del>- else
- $url = get_blog_option( $blog_id, 'siteurl' );
</del><ins>+ } else {
+ switch_to_blog( $blog_id );
+ $url = get_option( 'siteurl' );
+ restore_current_blog();
+ }
</ins><span class="cx">
</span><span class="cx"> if ( 'relative' == $scheme )
</span><span class="cx"> $url = preg_replace( '#^.+://[^/]*#', '', $url );
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-includes/ms-blogs.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -222,9 +222,11 @@
</span><span class="cx"> return $details;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $details->blogname = get_blog_option( $blog_id, 'blogname' );
- $details->siteurl = get_blog_option( $blog_id, 'siteurl' );
- $details->post_count = get_blog_option( $blog_id, 'post_count' );
</del><ins>+ switch_to_blog( $blog_id );
+ $details->blogname = get_option( 'blogname' );
+ $details->siteurl = get_option( 'siteurl' );
+ $details->post_count = get_option( 'post_count' );
+ restore_current_blog();
</ins><span class="cx">
</span><span class="cx"> $details = apply_filters( 'blog_details', $details );
</span><span class="cx">
</span><span class="lines">@@ -298,8 +300,11 @@
</span><span class="cx"> do_action( "make_ham_blog", $blog_id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($details[ 'public' ]) )
- update_blog_option( $blog_id, 'blog_public', $details[ 'public' ] );
</del><ins>+ if ( isset($details[ 'public' ]) ) {
+ switch_to_blog( $blog_id );
+ update_option( 'blog_public', $details[ 'public' ] );
+ restore_current_blog();
+ }
</ins><span class="cx">
</span><span class="cx"> refresh_blog_details($blog_id);
</span><span class="cx">
</span><span class="lines">@@ -307,127 +312,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve option value for a given blog id based on name of option.
- *
- * If the option does not exist or does not have a value, then the return value
- * will be false. This is useful to check whether you need to install an option
- * and is commonly used during installation of plugin options and to test
- * whether upgrading is required.
- *
- * If the option was serialized then it will be unserialized when it is returned.
- *
- * @since MU
- *
- * @param int $id A blog ID. Can be null to refer to the current blog.
- * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
- * @param mixed $default Optional. Default value to return if the option does not exist.
- * @return mixed Value set for the option.
- */
-function get_blog_option( $id, $option, $default = false ) {
- $id = (int) $id;
-
- if ( empty( $id ) )
- $id = get_current_blog_id();
-
- if ( get_current_blog_id() == $id )
- return get_option( $option, $default );
-
- switch_to_blog( $id );
- $option = get_option( $option, $default );
- restore_current_blog();
-
- return $option;
-}
-
-/**
- * Add a new option for a given blog id.
- *
- * You do not need to serialize values. If the value needs to be serialized, then
- * it will be serialized before it is inserted into the database. Remember,
- * resources can not be serialized or added as an option.
- *
- * You can create options without values and then update the values later.
- * Existing options will not be updated and checks are performed to ensure that you
- * aren't adding a protected WordPress option. Care should be taken to not name
- * options the same as the ones which are protected.
- *
- * @since MU
- *
- * @param int $id A blog ID. Can be null to refer to the current blog.
- * @param string $option Name of option to add. Expected to not be SQL-escaped.
- * @param mixed $value Optional. Option value, can be anything. Expected to not be SQL-escaped.
- * @return bool False if option was not added and true if option was added.
- */
-function add_blog_option( $id, $option, $value ) {
- $id = (int) $id;
-
- if ( empty( $id ) )
- $id = get_current_blog_id();
-
- if ( get_current_blog_id() == $id )
- return add_option( $option, $value );
-
- switch_to_blog( $id );
- $return = add_option( $option, $value );
- restore_current_blog();
-
- return $return;
-}
-
-/**
- * Removes option by name for a given blog id. Prevents removal of protected WordPress options.
- *
- * @since MU
- *
- * @param int $id A blog ID. Can be null to refer to the current blog.
- * @param string $option Name of option to remove. Expected to not be SQL-escaped.
- * @return bool True, if option is successfully deleted. False on failure.
- */
-function delete_blog_option( $id, $option ) {
- $id = (int) $id;
-
- if ( empty( $id ) )
- $id = get_current_blog_id();
-
- if ( get_current_blog_id() == $id )
- return delete_option( $option );
-
- switch_to_blog( $id );
- $return = delete_option( $option );
- restore_current_blog();
-
- return $return;
-}
-
-/**
- * Update an option for a particular blog.
- *
- * @since MU
- *
- * @param int $id The blog id
- * @param string $option The option key
- * @param mixed $value The option value
- * @return bool True on success, false on failrue.
- */
-function update_blog_option( $id, $option, $value, $deprecated = null ) {
- $id = (int) $id;
-
- if ( null !== $deprecated )
- _deprecated_argument( __FUNCTION__, '3.1' );
-
- if ( get_current_blog_id() == $id )
- return update_option( $option, $value );
-
- switch_to_blog( $id );
- $return = update_option( $option, $value );
- restore_current_blog();
-
- refresh_blog_details( $id );
-
- return $return;
-}
-
-/**
</del><span class="cx"> * Switch the current blog.
</span><span class="cx"> *
</span><span class="cx"> * This function is useful if you need to pull posts, or other information,
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (21413 => 21414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2012-08-03 01:06:05 UTC (rev 21413)
+++ trunk/wp-includes/ms-deprecated.php 2012-08-03 17:51:42 UTC (rev 21414)
</span><span class="lines">@@ -270,3 +270,136 @@
</span><span class="cx"> }
</span><span class="cx"> return $url;
</span><span class="cx"> }
</span><ins>+
+/**
+ * Retrieve option value for a given blog id based on name of option.
+ *
+ * If the option does not exist or does not have a value, then the return value
+ * will be false. This is useful to check whether you need to install an option
+ * and is commonly used during installation of plugin options and to test
+ * whether upgrading is required.
+ *
+ * If the option was serialized then it will be unserialized when it is returned.
+ *
+ * @since MU
+ * @deprecated 3.5.0
+ *
+ * @param int $id A blog ID. Can be null to refer to the current blog.
+ * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed $default Optional. Default value to return if the option does not exist.
+ * @return mixed Value set for the option.
+ */
+function get_blog_option( $id, $option, $default = false ) {
+ _deprecated_function( __FUNCTION__, '3.5' );
+
+ $id = (int) $id;
+
+ if ( empty( $id ) )
+ $id = get_current_blog_id();
+
+ if ( get_current_blog_id() == $id )
+ return get_option( $option, $default );
+
+ switch_to_blog( $id );
+ $option = get_option( $option, $default );
+ restore_current_blog();
+
+ return $option;
+}
+
+/**
+ * Add a new option for a given blog id.
+ *
+ * You do not need to serialize values. If the value needs to be serialized, then
+ * it will be serialized before it is inserted into the database. Remember,
+ * resources can not be serialized or added as an option.
+ *
+ * You can create options without values and then update the values later.
+ * Existing options will not be updated and checks are performed to ensure that you
+ * aren't adding a protected WordPress option. Care should be taken to not name
+ * options the same as the ones which are protected.
+ *
+ * @since MU
+ * @deprecated 3.5.0
+ *
+ * @param int $id A blog ID. Can be null to refer to the current blog.
+ * @param string $option Name of option to add. Expected to not be SQL-escaped.
+ * @param mixed $value Optional. Option value, can be anything. Expected to not be SQL-escaped.
+ * @return bool False if option was not added and true if option was added.
+ */
+function add_blog_option( $id, $option, $value ) {
+ _deprecated_function( __FUNCTION__, '3.5' );
+
+ $id = (int) $id;
+
+ if ( empty( $id ) )
+ $id = get_current_blog_id();
+
+ if ( get_current_blog_id() == $id )
+ return add_option( $option, $value );
+
+ switch_to_blog( $id );
+ $return = add_option( $option, $value );
+ restore_current_blog();
+
+ return $return;
+}
+
+/**
+ * Removes option by name for a given blog id. Prevents removal of protected WordPress options.
+ *
+ * @since MU
+ * @deprecated 3.5.0
+ *
+ * @param int $id A blog ID. Can be null to refer to the current blog.
+ * @param string $option Name of option to remove. Expected to not be SQL-escaped.
+ * @return bool True, if option is successfully deleted. False on failure.
+ */
+function delete_blog_option( $id, $option ) {
+ _deprecated_function( __FUNCTION__, '3.5' );
+
+ $id = (int) $id;
+
+ if ( empty( $id ) )
+ $id = get_current_blog_id();
+
+ if ( get_current_blog_id() == $id )
+ return delete_option( $option );
+
+ switch_to_blog( $id );
+ $return = delete_option( $option );
+ restore_current_blog();
+
+ return $return;
+}
+
+/**
+ * Update an option for a particular blog.
+ *
+ * @since MU
+ * @deprecated 3.5.0
+ *
+ * @param int $id The blog id
+ * @param string $option The option key
+ * @param mixed $value The option value
+ * @return bool True on success, false on failrue.
+ */
+function update_blog_option( $id, $option, $value, $deprecated = null ) {
+ _deprecated_function( __FUNCTION__, '3.5' );
+
+ $id = (int) $id;
+
+ if ( null !== $deprecated )
+ _deprecated_argument( __FUNCTION__, '3.1' );
+
+ if ( get_current_blog_id() == $id )
+ return update_option( $option, $value );
+
+ switch_to_blog( $id );
+ $return = update_option( $option, $value );
+ restore_current_blog();
+
+ refresh_blog_details( $id );
+
+ return $return;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>