<!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>[29200] trunk: Properly set `$subdomain_error` to `false` when applicable in `ms_subdomain_constants()`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29200">29200</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-16 22:34:18 +0000 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly set `$subdomain_error` to `false` when applicable in `ms_subdomain_constants()`. This was previously untestable because it used static vars: use globals instead.
Adds unit test.
Fixes <a href="http://core.trac.wordpress.org/ticket/28697">#28697</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsdefaultconstantsphp">trunk/src/wp-includes/ms-default-constants.php</a></li>
<li><a href="#trunktestsphpunittestsmsphp">trunk/tests/phpunit/tests/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-default-constants.php (29199 => 29200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-default-constants.php 2014-07-16 22:12:11 UTC (rev 29199)
+++ trunk/src/wp-includes/ms-default-constants.php 2014-07-16 22:34:18 UTC (rev 29200)
</span><span class="lines">@@ -114,17 +114,20 @@
</span><span class="cx"> * we will have translations loaded and can trigger warnings easily.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><ins>+ *
+ * @global boolean $subdomain_error
+ * @global boolean $subdomain_error_warn
</ins><span class="cx"> */
</span><span class="cx"> function ms_subdomain_constants() {
</span><del>- static $error = null;
- static $error_warn = false;
</del><ins>+ global $subdomain_error, $subdomain_error_warn;
</ins><span class="cx">
</span><del>- if ( false === $error )
</del><ins>+ if ( false === $subdomain_error ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( $error ) {
</del><ins>+ if ( $subdomain_error ) {
</ins><span class="cx"> $vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );
</span><del>- if ( $error_warn ) {
</del><ins>+ if ( $subdomain_error_warn ) {
</ins><span class="cx"> trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
</span><span class="cx"> } else {
</span><span class="cx"> _deprecated_argument( 'define()', '3.0', $vhost_deprecated );
</span><span class="lines">@@ -133,17 +136,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
</span><del>- if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) {
- $error = true;
- } else {
- $error = $error_warn = true;
</del><ins>+ $subdomain_error = true;
+ if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
+ $subdomain_error_warn = true;
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
</span><ins>+ $subdomain_error = false;
</ins><span class="cx"> define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
</span><span class="cx"> } elseif ( defined( 'VHOST' ) ) {
</span><del>- $error = true;
</del><ins>+ $subdomain_error = true;
</ins><span class="cx"> define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
</span><span class="cx"> } else {
</span><ins>+ $subdomain_error = false;
</ins><span class="cx"> define( 'SUBDOMAIN_INSTALL', false );
</span><span class="cx"> define( 'VHOST', 'no' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ms.php (29199 => 29200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ms.php 2014-07-16 22:12:11 UTC (rev 29199)
+++ trunk/tests/phpunit/tests/ms.php 2014-07-16 22:34:18 UTC (rev 29200)
</span><span class="lines">@@ -25,6 +25,17 @@
</span><span class="cx"> $wpdb->suppress_errors( $this->suppress );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @ticket 28697
+ */
+ function test_ms_subdomain_constants() {
+ global $subdomain_error;
+
+ $this->assertFalse( $subdomain_error );
+ ms_subdomain_constants();
+ $this->assertFalse( $subdomain_error );
+ }
+
</ins><span class="cx"> function test_remove_user_from_blog() {
</span><span class="cx"> $user1 = $this->factory->user->create_and_get();
</span><span class="cx"> $user2 = $this->factory->user->create_and_get();
</span></span></pre>
</div>
</div>
</body>
</html>