From baf7f5604db9866b0a8fec3ee90bfd3560b89406 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 19 Jul 2014 23:14:15 +0000
Subject: [PATCH] After [29200], switch back to using `static` vars instead of
 adding 2 `global`s, as per Sergey.

Fixes #28697.

Built from https://develop.svn.wordpress.org/trunk@29250


git-svn-id: http://core.svn.wordpress.org/trunk@29034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-default-constants.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index c8dd091c0a..0f7d0ff6d3 100644
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -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;