vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #28697.


git-svn-id: https://develop.svn.wordpress.org/trunk@29250 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-07-19 23:13:19 +00:00
parent a1aa518788
commit ca5d586b8e
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/ms-default-constants.php
View File

@ -114,12 +114,10 @@ function ms_file_constants() {
* we will have translations loaded and can trigger warnings easily.
*
* @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 ) {
return;

11
tests/phpunit/tests/ms.php
View File

@ -25,17 +25,6 @@ class Tests_MS extends WP_UnitTestCase {
$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 );
}
function test_remove_user_from_blog() {
$user1 = $this->factory->user->create_and_get();
$user2 = $this->factory->user->create_and_get();