Changeset 29250

Timestamp:

07/19/2014 11:13:19 PM (11 years ago)

Author:

wonderboymusic

Message:

After [29200], switch back to using static vars instead of adding 2 globals, as per Sergey.

Fixes #28697.

Location:

trunk

Files:

• src/wp-includes/ms-default-constants.php (modified) (1 diff)
• 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() {
-    global $subdomain_error, $subdomain_error_warn;
+    static $subdomain_error = null;
+    static $subdomain_error_warn = null;
 
     if ( false === $subdomain_error ) {

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 );
     }