diff --git src/wp-includes/ms-default-constants.php src/wp-includes/ms-default-constants.php
index 8cbd2c3..b7b58ba 100644
|
|
function ms_subdomain_constants() { |
119 | 119 | static $error = null; |
120 | 120 | static $error_warn = false; |
121 | 121 | |
122 | | if ( false === $error ) |
| 122 | if ( false === $error ) { |
123 | 123 | return; |
| 124 | } |
124 | 125 | |
125 | 126 | if ( $error ) { |
126 | 127 | $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.' ); |
… |
… |
function ms_subdomain_constants() { |
133 | 134 | } |
134 | 135 | |
135 | 136 | if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) { |
136 | | if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) { |
137 | | $error = true; |
138 | | } else { |
139 | | $error = $error_warn = true; |
| 137 | $error = true; |
| 138 | if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) { |
| 139 | $error_warn = true; |
140 | 140 | } |
141 | 141 | } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) { |
| 142 | $error = false; |
142 | 143 | define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' ); |
143 | 144 | } elseif ( defined( 'VHOST' ) ) { |
144 | 145 | $error = true; |
145 | 146 | define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST ); |
146 | 147 | } else { |
| 148 | $error = false; |
147 | 149 | define( 'SUBDOMAIN_INSTALL', false ); |
148 | 150 | define( 'VHOST', 'no' ); |
149 | 151 | } |