<!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>[41380] trunk: Multisite: Introduce `get_main_site_id()`.</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/41380">41380</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/41380","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-15 11:14:49 +0000 (Fri, 15 Sep 2017)</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: Introduce `get_main_site_id()`.
This function can be used to easily get the main site ID of a given network via the optional `$network_id` parameter, which defaults to the current network. The existing `is_main_site()` now uses the new function internally and now accepts an optional `$network_id` parameter as well.
The main purpose of the new function at this point is to ensure that the `WP_Network::$blog_id` property is always set. Magic getters in the class have been adjusted to auto-fill the property when it is accessed and empty. Furthermore the function encapsulates logic that was previously part of `ms_load_current_site_and_network()` and has been replaced with a call to the function now.
Props spacedmonkey, jeremyfelt, johnjamesjacoby, flixos90.
Fixes <a href="https://core.trac.wordpress.org/ticket/29684">#29684</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpnetworkphp">trunk/src/wp-includes/class-wp-network.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisitegetMainSiteIdphp">trunk/tests/phpunit/tests/multisite/getMainSiteId.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpnetworkphp"></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-network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-network.php 2017-09-14 19:28:57 UTC (rev 41379)
+++ trunk/src/wp-includes/class-wp-network.php 2017-09-15 11:14:49 UTC (rev 41380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,9 +148,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'id':
</span><span class="cx" style="display: block; padding: 0 10px"> return (int) $this->id;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'blog_id':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->blog_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->get_main_site_id();
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'site_id':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return (int) $this->blog_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $this->get_main_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"> return null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,6 +202,25 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the main site ID for the network.
+ *
+ * Internal method used by the magic getter for the 'blog_id' and 'site_id'
+ * properties.
+ *
+ * @since 4.9.0
+ * @see get_main_site_id()
+ *
+ * @return string Main site ID as numeric string, for compatibility reasons.
+ */
+ private function get_main_site_id() {
+ if ( empty( $this->blog_id ) ) {
+ $this->blog_id = (string) get_main_site_id( $this->id );
+ }
+
+ return $this->blog_id;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set the site name assigned to the network if one has not been populated.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</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 2017-09-14 19:28:57 UTC (rev 41379)
+++ trunk/src/wp-includes/functions.php 2017-09-15 11:14:49 UTC (rev 41380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4390,22 +4390,95 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Determine whether a site is the main site of the current network.
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.9.0 The $network_id parameter has been added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $site_id Optional. Site ID to test. Defaults to current site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $site_id Optional. Site ID to test. Defaults to current site.
+ * @param int $network_id Optional. Network ID of the network to check for.
+ * Defaults to current network.
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function is_main_site( $site_id = null ) {
- if ( ! is_multisite() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function is_main_site( $site_id = null, $network_id = null ) {
+ if ( ! is_multisite() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $site_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_id = get_current_blog_id();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return (int) $site_id === (int) get_network()->site_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_id = (int) $site_id;
+
+ return $site_id === get_main_site_id( $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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets the main site ID.
+ *
+ * @since 4.9.0
+ *
+ * @param int $network_id Optional. The ID of the network for which to get the main site.
+ * Defaults to the current network.
+ * @return int The ID of the main site.
+ */
+function get_main_site_id( $network_id = null ) {
+ if ( ! is_multisite() ) {
+ return 1;
+ }
+
+ $network = get_network( $network_id );
+ if ( ! $network ) {
+ return 0;
+ }
+
+ /**
+ * Filters the main site ID.
+ *
+ * Returning anything other than null will effectively short-circuit the function, returning
+ * the result parsed as an integer immediately.
+ *
+ * @since 4.9.0
+ *
+ * @param int|null $main_site_id If anything other than null is returned, it is interpreted as the main site ID.
+ * @param int $network_id The ID of the network for which the main site was detected.
+ */
+ $main_site_id = apply_filters( 'pre_get_main_site_id', null, $network->id );
+ if ( null !== $main_site_id ) {
+ return (int) $main_site_id;
+ }
+
+ if ( ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) && $network->domain === DOMAIN_CURRENT_SITE && $network->path === PATH_CURRENT_SITE )
+ || ( defined( 'SITE_ID_CURRENT_SITE' ) && $network->id == SITE_ID_CURRENT_SITE ) ) {
+ if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
+ return BLOG_ID_CURRENT_SITE;
+ } elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+ return BLOGID_CURRENT_SITE;
+ }
+ }
+
+ $site = get_site();
+ if ( $site->domain === $network->domain && $site->path === $network->path ) {
+ $main_site_id = (int) $site->id;
+ } else {
+ $main_site_id = wp_cache_get( 'network:' . $network->id . ':main_site', 'site-options' );
+ if ( false === $main_site_id ) {
+ $_sites = get_sites( array(
+ 'fields' => 'ids',
+ 'number' => 1,
+ 'domain' => $network->domain,
+ 'path' => $network->path,
+ 'network_id' => $network->id,
+ ) );
+ $main_site_id = ! empty( $_sites ) ? array_shift( $_sites ) : 0;
+
+ wp_cache_add( 'network:' . $network->id . ':main_site', $main_site_id, 'site-options' );
+ }
+ }
+
+ return (int) $main_site_id;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Determine whether a network is the main network of the Multisite installation.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</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 2017-09-14 19:28:57 UTC (rev 41379)
+++ trunk/src/wp-includes/ms-load.php 2017-09-15 11:14:49 UTC (rev 41380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,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"> * Retrieves the closest matching site object by its domain and path.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * This will not necessarily return an exact match for a domain and path. Instead, it
</span><span class="cx" style="display: block; padding: 0 10px"> * breaks the domain and path into pieces that are then used to match the closest
</span><span class="cx" style="display: block; padding: 0 10px"> * possibility from a query.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,13 +424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Figure out the current network's main site.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $current_site->blog_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
- $current_site->blog_id = $current_blog->blog_id;
- } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
- $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
- $current_site->domain, $current_site->path ) );
- wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_site->blog_id = get_main_site_id( $current_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"> return true;
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitegetMainSiteIdphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/multisite/getMainSiteId.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/getMainSiteId.php (rev 0)
+++ trunk/tests/phpunit/tests/multisite/getMainSiteId.php 2017-09-15 11:14:49 UTC (rev 41380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,110 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+if ( is_multisite() ) :
+
+/**
+ * Tests for the get_main_site_id() function.
+ *
+ * @group ms-site
+ * @group multisite
+ */
+class Tests_Multisite_Get_Main_Site_ID extends WP_UnitTestCase {
+ protected static $network_ids;
+ protected static $site_ids;
+
+ public static function wpSetUpBeforeClass( $factory ) {
+ self::$network_ids = array(
+ 'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/' ),
+ 'wp.org/' => array( 'domain' => 'wp.org', 'path' => '/' ), // A network with no sites.
+ );
+
+ foreach ( self::$network_ids as &$id ) {
+ $id = $factory->network->create( $id );
+ }
+ unset( $id );
+
+ self::$site_ids = array(
+ 'www.w.org/' => array( 'domain' => 'www.w.org', 'path' => '/' ),
+ 'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/', 'site_id' => self::$network_ids['wordpress.org/'] ),
+ 'wordpress.org/foo/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/', 'site_id' => self::$network_ids['wordpress.org/'] ),
+ );
+
+ foreach ( self::$site_ids as &$id ) {
+ $id = $factory->blog->create( $id );
+ }
+ unset( $id );
+ }
+
+ public static function wpTearDownAfterClass() {
+ foreach( self::$site_ids as $id ) {
+ wpmu_delete_blog( $id, true );
+ }
+
+ global $wpdb;
+
+ foreach( self::$network_ids as $id ) {
+ $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
+ $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
+ }
+
+ wp_update_network_site_counts();
+ }
+
+ /**
+ * @ticket 29684
+ */
+ public function test_get_main_site_id_on_main_site_returns_self() {
+ $this->assertSame( get_current_blog_id(), get_main_site_id() );
+ }
+
+ /**
+ * @ticket 29684
+ */
+ public function test_get_main_site_id_returns_main_site_in_switched_context() {
+ $main_site_id = get_current_blog_id();
+ $other_site_id = self::$site_ids['www.w.org/'];
+
+ switch_to_blog( $other_site_id );
+ $result = get_main_site_id();
+ restore_current_blog();
+
+ $this->assertSame( $main_site_id, $result );
+ }
+
+ /**
+ * @ticket 29684
+ */
+ public function test_get_main_site_id_with_different_network_returns_correct_id() {
+ $this->assertSame( self::$site_ids['wordpress.org/'], get_main_site_id( self::$network_ids['wordpress.org/'] ) );
+ }
+
+ /**
+ * @ticket 29684
+ */
+ public function test_get_main_site_id_on_network_without_site_returns_0() {
+ $this->assertSame( 0, get_main_site_id( self::$network_ids['wp.org/'] ) );
+ }
+
+ /**
+ * @ticket 29684
+ */
+ public function test_get_main_site_id_on_invalid_network_returns_0() {
+ $this->assertSame( 0, get_main_site_id( 333 ) );
+ }
+
+ /**
+ * @ticket 29684
+ */
+ public function test_get_main_site_id_filtered() {
+ add_filter( 'pre_get_main_site_id', array( $this, 'filter_get_main_site_id' ) );
+ $result = get_main_site_id();
+
+ $this->assertSame( 333, $result );
+ }
+
+ public function filter_get_main_site_id() {
+ return 333;
+ }
+}
+
+endif;
</ins></span></pre></div>
<a id="trunktestsphpunittestsmultisitenetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/network.php 2017-09-14 19:28:57 UTC (rev 41379)
+++ trunk/tests/phpunit/tests/multisite/network.php 2017-09-15 11:14:49 UTC (rev 41380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,6 +583,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $original_count + 1, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 29684
+ */
+ public function test_network_blog_id_set() {
+ $network = get_network( self::$different_network_id );
+
+ $this->assertSame( (string) self::$different_site_ids[0], $network->blog_id );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2017-09-14 19:28:57 UTC (rev 41379)
+++ trunk/tests/phpunit/tests/multisite/site.php 2017-09-15 11:14:49 UTC (rev 41380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_Site extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $suppress = false;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $network_ids;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $site_ids;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,11 +34,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $factory->network->create( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ self::$site_ids = array(
+ 'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/', 'site_id' => self::$network_ids['make.wordpress.org/'] ),
+ 'make.wordpress.org/foo/' => array( 'domain' => 'make.wordpress.org', 'path' => '/foo/', 'site_id' => self::$network_ids['make.wordpress.org/'] ),
+ );
+
+ foreach ( self::$site_ids as &$id ) {
+ $id = $factory->blog->create( $id );
+ }
+ unset( $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"> public static function wpTearDownAfterClass() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach( self::$site_ids as $id ) {
+ wpmu_delete_blog( $id, true );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach( self::$network_ids as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1028,6 +1043,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_allow_unavailable_languages( $value, $option, $original_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $original_value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 29684
+ */
+ public function test_is_main_site_different_network() {
+ $this->assertTrue( is_main_site( self::$site_ids['make.wordpress.org/'], self::$network_ids['make.wordpress.org/'] ) );
+ }
+
+ /**
+ * @ticket 29684
+ */
+ public function test_is_main_site_different_network_random_site() {
+ $this->assertFalse( is_main_site( self::$site_ids['make.wordpress.org/foo/'], self::$network_ids['make.wordpress.org/'] ) );
+ }
</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"> endif;
</span></span></pre>
</div>
</div>
</body>
</html>