Changeset 29200

Timestamp:

07/16/2014 10:34:18 PM (10 years ago)

Author:

wonderboymusic

Message:

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 #28697.

Location:

trunk

Files:

• src/wp-includes/ms-default-constants.php (modified) (2 diffs)
• tests/phpunit/tests/ms.php (modified) (1 diff)

trunk/src/wp-includes/ms-default-constants.php

@@ -115 +115 @@
  *
  * @since 3.0.0
+ *
+ * @global boolean $subdomain_error
+ * @global boolean $subdomain_error_warn
  */
 function ms_subdomain_constants() {
-    static $error = null;
-    static $error_warn = false;
+    global $subdomain_error, $subdomain_error_warn;
 
-    if ( false === $error )
+    if ( false === $subdomain_error ) {
         return;
+    }
 
-    if ( $error ) {
+    if ( $subdomain_error ) {
         $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.' );
-        if ( $error_warn ) {
+        if ( $subdomain_error_warn ) {
             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 );
         } else {
@@ -134 +137 @@
 
     if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
-        if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) {
-            $error = true;
-        } else {
-            $error = $error_warn = true;
+        $subdomain_error = true;
+        if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
+            $subdomain_error_warn = true;
         }
     } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
+        $subdomain_error = false;
         define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
     } elseif ( defined( 'VHOST' ) ) {
-        $error = true;
+        $subdomain_error = true;
         define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
     } else {
+        $subdomain_error = false;
         define( 'SUBDOMAIN_INSTALL', false );
         define( 'VHOST', 'no' );

trunk/tests/phpunit/tests/ms.php

@@ -24 +24 @@
         parent::tearDown();
         $wpdb->suppress_errors( $this->suppress );
+    }
+
+    /**
+     * @ticket 28697
+     */
+    function test_ms_subdomain_constants() {
+        global $subdomain_error;
+
+        $this->assertFalse( $subdomain_error );
+        ms_subdomain_constants();
+        $this->assertFalse( $subdomain_error );
     }