<!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>[38457] trunk/src: Multisite: use `get_current_blog_id()` where applicable, in lieu of plucking the `$blog_id` global from outer space.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38457">38457</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38457","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-31 04:55:01 +0000 (Wed, 31 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Multisite: use `get_current_blog_id()` where applicable, in lieu of plucking the `$blog_id` global from outer space.
See <a href="https://core.trac.wordpress.org/ticket/37699">#37699</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpincludescachephp">trunk/src/wp-includes/cache.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserqueryphp">trunk/src/wp-includes/class-wp-user-query.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,13 +91,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = get_current_blog_id();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ), network_admin_url( 'theme-install.php' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'manage_network_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludescachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cache.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-includes/cache.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,14 +729,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Sets up object properties; PHP 5 style constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.8
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @global int $blog_id Global blog ID.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $blog_id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->multisite = is_multisite();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->blog_prefix = $this->multisite ? $blog_id . ':' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->blog_prefix = $this->multisite ? get_current_blog_id() . ':' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user-query.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-includes/class-wp-user-query.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function fill_query_vars( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blog_id' => $GLOBALS['blog_id'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blog_id' => get_current_blog_id(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'role__in' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'role__not_in' => array(),
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-includes/deprecated.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2357,7 +2357,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_users()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global int $blog_id The site ID of the site for those that use more than one site.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $id Site ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of users that are part of that site ID
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2365,9 +2364,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_users_of_blog( $id = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $blog_id;
- if ( empty($id) )
- $id = (int) $blog_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+ if ( empty( $id ) ) {
+ $id = get_current_blog_id();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_prefix = $wpdb->get_blog_prefix($id);
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> return $users;
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-includes/load.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,18 +470,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @global int $blog_id Blog ID.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_start_object_cache() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $blog_id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $first_init = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wp_cache_init' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ( WP_CONTENT_DIR . '/object-cache.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( function_exists( 'wp_cache_init' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( function_exists( 'wp_cache_init' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_using_ext_object_cache( true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $first_init = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,18 +492,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_using_ext_object_cache( true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_using_ext_object_cache() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_using_ext_object_cache() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ( ABSPATH . WPINC . '/cache.php' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If cache supports reset, reset instead of init if already
</span><span class="cx" style="display: block; padding: 0 10px"> * initialized. Reset signals to the cache that global IDs
</span><span class="cx" style="display: block; padding: 0 10px"> * have changed and it may need to update keys and cleanup caches.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
- wp_cache_switch_to_blog( $blog_id );
- elseif ( function_exists( 'wp_cache_init' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) ) {
+ wp_cache_switch_to_blog( get_current_blog_id() );
+ } elseif ( function_exists( 'wp_cache_init' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_init();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wp_cache_add_global_groups' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
</span></span></pre></div>
<a id="trunksrcwpincludesmsblogsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-includes/ms-blogs.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,17 +766,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function switch_to_blog( $new_blog, $deprecated = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $new_blog ) )
- $new_blog = $GLOBALS['blog_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = get_current_blog_id();
+ if ( empty( $new_blog ) ) {
+ $new_blog = $blog_id;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['_wp_switched_stack'][] = $blog_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If we're switching to the same blog id that we're on,
</span><span class="cx" style="display: block; padding: 0 10px"> * set the right vars, do the associated actions, but skip
</span><span class="cx" style="display: block; padding: 0 10px"> * the extra unnecessary work
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $new_blog == $GLOBALS['blog_id'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $new_blog == $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when the blog is switched.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,7 +794,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->set_blog_id( $new_blog );
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prev_blog_id = $GLOBALS['blog_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prev_blog_id = $blog_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['blog_id'] = $new_blog;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,11 +802,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_object_cache;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $global_groups = $wp_object_cache->global_groups;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $global_groups = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wp_cache_add_global_groups' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -848,12 +850,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function restore_current_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $GLOBALS['_wp_switched_stack'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = array_pop( $GLOBALS['_wp_switched_stack'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = get_current_blog_id();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $GLOBALS['blog_id'] == $blog ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $blog_id == $blog ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/ms-blogs.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'switch_blog', $blog, $blog );
</span><span class="cx" style="display: block; padding: 0 10px"> // If we still have items in the switched stack, consider ourselves still 'switched'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,7 +866,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->set_blog_id( $blog );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prev_blog_id = $GLOBALS['blog_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prev_blog_id = $blog_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['blog_id'] = $blog;
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -871,10 +875,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_object_cache;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $global_groups = $wp_object_cache->global_groups;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $global_groups = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-includes/ms-functions.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1966,15 +1966,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global int $blog_id
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param array $details
</span><span class="cx" style="display: block; padding: 0 10px"> * @return true|WP_Error|void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_existing_user_to_blog( $details = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $blog_id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $details ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = get_current_blog_id();
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after an existing user is added to a site.
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2016-08-31 00:23:26 UTC (rev 38456)
+++ trunk/src/wp-includes/user.php 2016-08-31 04:55:01 UTC (rev 38457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,8 +965,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 Added the 'display_name_with_login' value for 'show'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global int $blog_id
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Array or string of arguments to generate a drop-down of users.
</span><span class="cx" style="display: block; padding: 0 10px"> * See WP_User_Query::prepare_query() for additional available arguments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,7 +1014,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => '', 'exclude' => '', 'multi' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show' => 'display_name', 'echo' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected' => 0, 'name' => 'user', 'class' => '', 'id' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blog_id' => $GLOBALS['blog_id'], 'who' => '', 'include_selected' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blog_id' => get_current_blog_id(), 'who' => '', 'include_selected' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'option_none_value' => -1
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>