<!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>[38814] trunk/src: Multisite: Use `get_network()` and `get_current_network_id()` for current network data.</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/38814">38814</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/38814","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-19 04:46:14 +0000 (Wed, 19 Oct 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_network()` and `get_current_network_id()` for current network data.
`get_network()` falls back to the current network when called without any arguments. Between this and `get_current_network_id()`, we can replace almost all instances of the global `$current_site` and all instances of `get_current_site()`.
This effectively deprecates `get_current_site()`, something that we'll do in a future ticket.
Props flixos90.
Fixes <a href="https://core.trac.wordpress.org/ticket/37414">#37414</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludeshttpphp">trunk/src/wp-includes/http.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.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="#trunksrcwpincludesmsdefaultconstantsphp">trunk/src/wp-includes/ms-default-constants.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminheaderphp"></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/admin-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-header.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/admin-header.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,9 +33,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = esc_html( strip_tags( $title ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( is_user_admin() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_title = get_bloginfo( 'name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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-ms-sites-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-ms-sites-list-table.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,7 +518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_current_site()->blog_id != $blog['blog_id'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network()->site_id != $blog['blog_id'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $blog['deleted'] == '1' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['activate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></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-ms-users-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-ms-users-list-table.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $path = ( $val->path === '/' ) ? '' : $val->path;
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="site-' . $val->site_id . '" >';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_network()->domain, '', $val->domain . $path ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' <small class="row-actions">';
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></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/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/includes/ms.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $blog_id, 'deleted', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a full blog object is not available, do not destroy anything.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $drop && ! $blog ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,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"> // Don't destroy the initial, main, or root blog.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_network->path && $blog->domain == $current_network->domain ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $drop = false;
</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="trunksrcwpadminincludesschemaphp"></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/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/includes/schema.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.0 multisite
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: site tagline */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_network()->site_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
</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="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/includes/upgrade.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,12 +161,12 @@
</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"> $first_post = sprintf( $first_post,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_current_site()->site_name )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
</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"> // Back-compat for pre-4.4
</span><span class="cx" style="display: block; padding: 0 10px"> $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_post = str_replace( 'SITE_NAME', get_current_site()->site_name, $first_post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></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/ms-delete-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/ms-delete-site.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/ms-delete-site.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $wpdb->blogid );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), $current_site->site_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), get_network()->site_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( "I'm sorry, the link you clicked is stale. Please select another option." ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###USERNAME###', $user->user_login, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###URL_DELETE###', $url_delete, $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITE_NAME###', get_network()->site_name, $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), get_network()->site_name); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" name="deletedirect">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></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/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/network/settings.php 2016-10-19 04:46:14 UTC (rev 38814)
</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"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( get_network()->site_name ) ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></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/network/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/network/site-new.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,11 +86,11 @@
</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"> if ( is_subdomain_install() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
- $path = $current_site->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', get_network()->domain );
+ $path = get_network()->path;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $newdomain = $current_site->domain;
- $path = $current_site->path . $domain . '/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newdomain = get_network()->domain;
+ $path = get_network()->path . $domain . '/';
</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"> $password = 'N/A';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,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->hide_errors();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, $current_site->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->show_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: network name */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '[%s] New Site Created' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site->site_name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_network()->site_name
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: user login, 2: site url, 3: site name/title */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,9 +198,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_subdomain_install() ) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo get_network()->domain . get_network()->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></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/network/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/network/sites.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/html; charset=utf-8' );
</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 ( $current_site->blog_id == $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network()->site_id == $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updated_action = 'not_deleted';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $id, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $updated_action = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['allblogs'] as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $val != '0' && $val != $current_site->blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $val != '0' && $val != get_network()->site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_site', $val ) )
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></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/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-admin/network/users.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $userfunction = 'all_spam';
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $user_id, true );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $blogs as $details ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $details->userblog_id != get_network()->site_id ) // main blog not a spam !
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $details->userblog_id, 'spam', '1' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_status( $user_id, 'spam', '1' );
</span></span></pre></div>
<a id="trunksrcwpincludesadminbarphp"></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/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/admin-bar.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,10 +312,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: site name */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_user_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: site name */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
</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"> $title = wp_html_excerpt( $blogname, 40, '…' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></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-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blogs as $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't include blogs that aren't hosted at this site.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blog->site_id != get_current_site()->id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $blog->site_id != get_current_network_id() )
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $blog->userblog_id;
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/functions.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4302,23 +4302,18 @@
</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"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global object $current_site
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $site_id Optional. Site ID to test. Defaults to current site.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if $site_id is the main site of the network, or if not
</span><span class="cx" style="display: block; padding: 0 10px"> * running Multisite.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_main_site( $site_id = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This is the current network's information; 'site' is old terminology.
- global $current_site;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $site_id )
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return (int) $site_id === (int) $current_site->blog_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $site_id === (int) get_network()->site_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4334,10 +4329,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 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">- $current_network_id = (int) get_current_site()->id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( null === $network_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $network_id = $current_network_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $network_id = get_current_network_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"> $network_id = (int) $network_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4357,11 +4350,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 1;
</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">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $main_network_id = PRIMARY_NETWORK_ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $current_site->id ) && 1 === (int) $current_site->id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $current_network->id ) && 1 === (int) $current_network->id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the current network has an ID of 1, assume it is the main network.
</span><span class="cx" style="display: block; padding: 0 10px"> $main_network_id = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludeshttpphp"></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/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/http.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/http.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,7 +617,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> static $queried = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_external )
</span><span class="cx" style="display: block; padding: 0 10px"> return $is_external;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $host === get_current_site()->domain )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $host === get_network()->domain )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $queried[ $host ] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $queried[ $host ];
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/link-template.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3255,12 +3255,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() )
</span><span class="cx" style="display: block; padding: 0 10px"> return site_url($path, $scheme);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'relative' == $scheme )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $current_site->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = $current_network->path;
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $path && is_string( $path ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $url .= ltrim( $path, '/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3297,16 +3297,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() )
</span><span class="cx" style="display: block; padding: 0 10px"> return home_url($path, $scheme);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</ins><span class="cx" style="display: block; padding: 0 10px"> $orig_scheme = $scheme;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'relative' == $scheme )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $current_site->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = $current_network->path;
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $path && is_string( $path ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $url .= ltrim( $path, '/' );
</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-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/load.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,8 +814,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</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 WP_Network $current_site The current network.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return int The ID of the current network.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_current_network_id() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,13 +821,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 1;
</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">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</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 ( ! isset( $current_site->id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $current_network->id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_main_network_id();
</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">- return absint( $current_site->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return absint( $current_network->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="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-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/ms-blogs.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,15 +81,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|null The site ID, or null if no site is found for the given slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_id_from_blogname( $slug ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</ins><span class="cx" style="display: block; padding: 0 10px"> $slug = trim( $slug, '/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_subdomain_install() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
- $path = $current_site->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
+ $path = $current_network->path;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $domain = $current_site->domain;
- $path = $current_site->path . $slug . '/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $domain = $current_network->domain;
+ $path = $current_network->path . $slug . '/';
</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"> $site_ids = get_sites( array(
</span></span></pre></div>
<a id="trunksrcwpincludesmsdefaultconstantsphp"></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-default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-default-constants.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/ms-default-constants.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,19 +47,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function ms_cookie_constants( ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</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"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !defined( 'COOKIEPATH' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'COOKIEPATH', $current_site->path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'COOKIEPATH', $current_network->path );
</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"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !defined( 'SITECOOKIEPATH' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'SITECOOKIEPATH', $current_site->path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'SITECOOKIEPATH', $current_network->path );
</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"> * @since 2.6.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,10 +76,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $current_site->cookie_domain ) )
- define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !empty( $current_network->cookie_domain ) )
+ define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define('COOKIE_DOMAIN', '.' . $current_site->domain);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define('COOKIE_DOMAIN', '.' . $current_network->domain);
</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="trunksrcwpincludesmsdeprecatedphp"></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-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/ms-deprecated.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $blog = get_site_option( 'dashboard_blog' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return get_blog_details( $blog );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_blog_details( get_current_site()->blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_blog_details( get_network()->site_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="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-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/ms-functions.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,8 +546,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $domain;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
- $base = $current_site->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
+ $base = $current_network->path;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_title = strip_tags( $blog_title );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('blogname', __( 'Site name must be at least 4 characters.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // do not allow users to create a blog that conflicts with a page on the main blog.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // all numeric?
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,7 +612,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mydomain = "$domain";
</span><span class="cx" style="display: block; padding: 0 10px"> $path = $base.$blogname.'/';
</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 ( domain_exists($mydomain, $path, $current_site->id) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( domain_exists($mydomain, $path, $current_network->id) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( username_exists( $blogname ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -789,7 +789,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"> // Send email with activation link.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_subdomain_install() || get_current_site()->id != 1 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !is_subdomain_install() || get_current_network_id() != 1 )
</ins><span class="cx" style="display: block; padding: 0 10px"> $activate_url = network_site_url("wp-activate.php?key=$key");
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1334,7 +1334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $blog_title The title of the new site.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_blog( $blog_id, $blog_title = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $wp_roles, $current_site;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb, $wp_roles;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cast for security
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = (int) $blog_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1363,7 +1363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $siteurl = set_url_scheme( $siteurl, 'https' );
</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 ( 'https' === parse_url( get_home_url( $current_site->blog_id ), PHP_URL_SCHEME ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'https' === parse_url( get_home_url( get_network()->site_id ), PHP_URL_SCHEME ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $home = set_url_scheme( $home, 'https' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1375,7 +1375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_site_option( 'ms_files_rewriting' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blogname', wp_unslash( $blog_title ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'admin_email', '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1430,7 +1430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</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"> * Filters whether to bypass the welcome email after site activation.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1470,7 +1470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_blogaddress_by_id($blog_id);
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email );
</ins><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1500,8 +1500,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $welcome_email;
</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( $current_site->site_name ) )
- $current_site->site_name = 'WordPress';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $current_network->site_name ) )
+ $current_network->site_name = 'WordPress';
</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"> * Filters the subject of the welcome email after site activation.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1510,7 +1510,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject Subject of the email.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_network->site_name, wp_unslash( $title ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1531,7 +1531,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</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"> * Filters whether to bypass the welcome email after user activation.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1564,7 +1564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta Signup meta data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email );
</ins><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1578,8 +1578,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $welcome_email;
</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( $current_site->site_name ) )
- $current_site->site_name = 'WordPress';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $current_network->site_name ) )
+ $current_network->site_name = 'WordPress';
</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"> * Filters the subject of the welcome email after user activation.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1588,7 +1588,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject Subject of the email.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_network->site_name, $user->user_login) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1877,7 +1877,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The current site's domain
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function redirect_this_site( $deprecated = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array( get_current_site()->domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array( get_network()->domain );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2024,7 +2024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $meta[ 'add_to_blog' ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $meta[ 'add_to_blog' ];
</span><span class="cx" style="display: block; padding: 0 10px"> $role = $meta[ 'new_role' ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_user_from_blog($user_id, get_current_site()->blog_id); // remove user from main blog.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_user_from_blog($user_id, get_network()->site_id); // remove user from main blog.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $blog_id, $user_id, $role );
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( $user_id, 'primary_blog', $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2038,7 +2038,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function fix_phpmailer_messageid( $phpmailer ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $phpmailer->Hostname = get_current_site()->domain;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $phpmailer->Hostname = get_network()->domain;
</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="trunksrcwpincludesmsloadphp"></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-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/ms-load.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return WP_CONTENT_DIR . '/blog-inactive.php';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_network()->domain ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: admin email link */
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></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/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-includes/option.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1069,8 +1069,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_option()
</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 $wpdb
- * @global object $current_site
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $network_id ID of the network. Can be null to default to the current network ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1078,7 +1077,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Value set for the option.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_network_option( $network_id, $option, $default = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $current_site;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $network_id && ! is_numeric( $network_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1087,8 +1086,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = (int) $network_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback to the current network if a network ID is not specified.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $network_id && is_multisite() ) {
- $network_id = $current_site->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $network_id ) {
+ $network_id = get_current_network_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1186,8 +1185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see add_option()
</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 $wpdb
- * @global object $current_site
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $network_id ID of the network. Can be null to default to the current network ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option Name of option to add. Expected to not be SQL-escaped.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1195,7 +1193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool False if option was not added and true if option was added.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_network_option( $network_id, $option, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $current_site;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $network_id && ! is_numeric( $network_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1204,8 +1202,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = (int) $network_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback to the current network if a network ID is not specified.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $network_id && is_multisite() ) {
- $network_id = $current_site->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $network_id ) {
+ $network_id = get_current_network_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"> wp_protect_special_option( $option );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1296,15 +1294,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see delete_option()
</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 $wpdb
- * @global object $current_site
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $network_id ID of the network. Can be null to default to the current network ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option Name of option to remove. Expected to not be SQL-escaped.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, if succeed. False, if failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function delete_network_option( $network_id, $option ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $current_site;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $network_id && ! is_numeric( $network_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1313,8 +1310,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = (int) $network_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback to the current network if a network ID is not specified.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $network_id && is_multisite() ) {
- $network_id = $current_site->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $network_id ) {
+ $network_id = get_current_network_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1378,8 +1375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see update_option()
</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 $wpdb
- * @global object $current_site
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $network_id ID of the network. Can be null to default to the current network ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option Name of option. Expected to not be SQL-escaped.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1387,7 +1383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool False if value was not updated and true if value was updated.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function update_network_option( $network_id, $option, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $current_site;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $network_id && ! is_numeric( $network_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1396,8 +1392,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = (int) $network_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback to the current network if a network ID is not specified.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $network_id && is_multisite() ) {
- $network_id = $current_site->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $network_id ) {
+ $network_id = get_current_network_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"> wp_protect_special_option( $option );
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-login.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $login_header_url = network_home_url();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $login_header_title = get_current_site()->site_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $login_header_title = get_network()->site_name;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $login_header_url = __( 'https://wordpress.org/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $login_header_title = __( 'Powered by WordPress' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogname = get_current_site()->site_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogname = get_network()->site_name;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * The blogname option is escaped with esc_html on the way into the database
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2016-10-19 03:19:13 UTC (rev 38813)
+++ trunk/src/wp-signup.php 2016-10-19 04:46:14 UTC (rev 38814)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = new WP_Error();
</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">- $current_site = get_current_site();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_network = get_network();
</ins><span class="cx" style="display: block; padding: 0 10px"> // Blog name
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_subdomain_install() )
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="blogname">' . __('Site Name:') . '</label>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,15 +112,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_subdomain_install() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '</span><br />';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site = $current_site->domain . $current_site->path . __( 'sitename' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site = $current_network->domain . $current_network->path . __( 'sitename' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site = __( 'domain' ) . '.' . $site_domain . $current_network->path;
</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"> /* translators: %s: site address */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_title = $filtered_results['blog_title'];
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = $filtered_results['errors'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_current_site()->site_name ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_network()->site_name ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $errors->get_error_code() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,7 +532,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: name of the network */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Get your own %s account in seconds' ), get_current_site()->site_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Get your own %s account in seconds' ), get_network()->site_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="stage" value="validate-user-signup" />
</span></span></pre>
</div>
</div>
</body>
</html>