Merge pull request #987 from Codeinwp/fix/multiple-custom-domains

selul · web-flow · commit 7e9bf78f13a4 · 2025-10-08T21:50:58.000+03:00
fix: prioritize config over api domain
diff --git a/inc/config.php b/inc/config.php
@@ -121,10 +121,10 @@ public static function init( $service_settings = [] ) {
 			self::$secret = trim( $service_settings['secret'] );
 		}
 		self::$service_url = sprintf( 'https://%s.%s', self::$key, self::$base_domain );
-		if ( isset( $service_settings['domain'] ) && ! empty( $service_settings['domain'] ) ) {
-			self::$service_url = sprintf( 'https://%s', $service_settings['domain'] );
-		} elseif ( defined( 'OPTML_CUSTOM_DOMAIN' ) ) {
+		if ( defined( 'OPTML_CUSTOM_DOMAIN' ) ) {
 			self::$service_url = constant( 'OPTML_CUSTOM_DOMAIN' );
+		} elseif ( isset( $service_settings['domain'] ) && ! empty( $service_settings['domain'] ) ) {
+			self::$service_url = sprintf( 'https://%s', $service_settings['domain'] );
 		}
 
 		$options = [ 'domain' => parse_url( self::$service_url, PHP_URL_HOST ) ];

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,10 @@ public static function init( $service_settings = [] ) {`
`121`	`121`	`self::$secret = trim( $service_settings['secret'] );`
`122`	`122`	`}`
`123`	`123`	`self::$service_url = sprintf( 'https://%s.%s', self::$key, self::$base_domain );`
`124`		`- if ( isset( $service_settings['domain'] ) && ! empty( $service_settings['domain'] ) ) {`
`125`		`- self::$service_url = sprintf( 'https://%s', $service_settings['domain'] );`
`126`		`- } elseif ( defined( 'OPTML_CUSTOM_DOMAIN' ) ) {`
	`124`	`+ if ( defined( 'OPTML_CUSTOM_DOMAIN' ) ) {`
`127`	`125`	`self::$service_url = constant( 'OPTML_CUSTOM_DOMAIN' );`
	`126`	`+ } elseif ( isset( $service_settings['domain'] ) && ! empty( $service_settings['domain'] ) ) {`
	`127`	`+ self::$service_url = sprintf( 'https://%s', $service_settings['domain'] );`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`$options = [ 'domain' => parse_url( self::$service_url, PHP_URL_HOST ) ];`