Sync: IDC: Swap DOMAIN_MAPPING constant check to SUNRISE_LOADED

ebinnion · ebinnion · commit 8be4bea99530 · 2017-07-18T18:39:33.000-05:00
In the WordPress MU Domain Mapping plugin, the DOMAIN_MAPPING constant is only set if we're actively mapping a domain. So, if thisdomain.com points to somesubsite.network.com. This led to the 3rd party domain mapping logic to fail for site where the admin was not using the mapped domain.

The SUNRISE_LOADED constant is loaded on every request with the WordPress MU Domain Mapping plugin.
diff --git a/3rd-party/domain-mapping.php b/3rd-party/domain-mapping.php
@@ -58,7 +58,7 @@ function attempt_to_hook_domain_mapping_plugins() {
 	 * @return bool
 	 */
 	function hook_wordpress_mu_domain_mapping() {
-		if ( ! Jetpack_Constants::is_defined( 'DOMAIN_MAPPING' ) || ! $this->function_exists( 'domain_mapping_siteurl' ) ) {
+		if ( ! Jetpack_Constants::is_defined( 'SUNRISE_LOADED' ) || ! $this->function_exists( 'domain_mapping_siteurl' ) ) {
 			return false;
 		}
 
diff --git a/tests/php/3rd-party/test_class.jetpack-domain-mapping.php b/tests/php/3rd-party/test_class.jetpack-domain-mapping.php
@@ -55,7 +55,7 @@ function test_domain_mapping_should_stop_search_after_hooking_once() {
 	}
 
 	function test_domain_mapping_mu_domain_mapping_not_hooked_when_function_not_exists() {
-		Jetpack_Constants::set_constant( 'DOMAIN_MAPPING', true );
+		Jetpack_Constants::set_constant( 'SUNRISE_LOADED', true );
 
 		$stub = $this->getMockBuilder( 'MockDomainMapping' )
 			->setMethods( array( 'function_exists' ) )
@@ -74,7 +74,7 @@ function test_domain_mapping_mu_domain_mapping_not_hooked_when_function_not_exis
 	}
 
 	function test_domain_mapping_mu_domain_mapping_hooked_when_function_exists() {
-		Jetpack_Constants::set_constant( 'DOMAIN_MAPPING', true );
+		Jetpack_Constants::set_constant( 'SUNRISE_LOADED', true );
 
 		$stub = $this->getMockBuilder( 'MockDomainMapping' )
 			->setMethods( array( 'function_exists' ) )

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function attempt_to_hook_domain_mapping_plugins() {`
`58`	`58`	`* @return bool`
`59`	`59`	`*/`
`60`	`60`	`function hook_wordpress_mu_domain_mapping() {`
`61`		`- if ( ! Jetpack_Constants::is_defined( 'DOMAIN_MAPPING' ) \|\| ! $this->function_exists( 'domain_mapping_siteurl' ) ) {`
	`61`	`+ if ( ! Jetpack_Constants::is_defined( 'SUNRISE_LOADED' ) \|\| ! $this->function_exists( 'domain_mapping_siteurl' ) ) {`
`62`	`62`	`return false;`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function test_domain_mapping_should_stop_search_after_hooking_once() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`function test_domain_mapping_mu_domain_mapping_not_hooked_when_function_not_exists() {`
`58`		`- Jetpack_Constants::set_constant( 'DOMAIN_MAPPING', true );`
	`58`	`+ Jetpack_Constants::set_constant( 'SUNRISE_LOADED', true );`
`59`	`59`
`60`	`60`	`$stub = $this->getMockBuilder( 'MockDomainMapping' )`
`61`	`61`	`->setMethods( array( 'function_exists' ) )`
`@@ -74,7 +74,7 @@ function test_domain_mapping_mu_domain_mapping_not_hooked_when_function_not_exis`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`function test_domain_mapping_mu_domain_mapping_hooked_when_function_exists() {`
`77`		`- Jetpack_Constants::set_constant( 'DOMAIN_MAPPING', true );`
	`77`	`+ Jetpack_Constants::set_constant( 'SUNRISE_LOADED', true );`
`78`	`78`
`79`	`79`	`$stub = $this->getMockBuilder( 'MockDomainMapping' )`
`80`	`80`	`->setMethods( array( 'function_exists' ) )`