Skip to content

Commit 4ee2eae

Browse files
committed
fix: update domain DNS handling and improve custom domain retrieval logic
1 parent 7585417 commit 4ee2eae

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

inc/admin.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,9 @@ private function localize_dashboard_app() {
13891389
$lang_code = isset( $available_languages[ $language ] ) ? 'de' : 'en';
13901390

13911391
$site_settings = $this->settings->get_site_settings();
1392-
$service_data['domain_dns'] = ltrim( Optml_Config::$service_url, 'https://' );
1392+
if ( ! empty( $service_data ) ) {
1393+
$service_data['domain_dns'] = $this->settings->get_cdn_url();
1394+
}
13931395
return [
13941396
'strings' => $this->get_dashboard_strings(),
13951397
'assets_url' => OPTML_URL . 'assets/',

inc/settings.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,14 +714,14 @@ public function get_cdn_url() {
714714
return '';
715715
}
716716

717-
if ( isset( $service_data['is_cname_assigned'] ) && $service_data['is_cname_assigned'] === 'yes' && ! empty( $service_data['domain'] ) ) {
718-
return strtolower( $service_data['domain'] );
719-
}
720-
721717
if ( defined( 'OPTML_CUSTOM_DOMAIN' ) && constant( 'OPTML_CUSTOM_DOMAIN' ) ) {
722718
return parse_url( strtolower( OPTML_CUSTOM_DOMAIN ), PHP_URL_HOST );
723719
}
724720

721+
if ( isset( $service_data['is_cname_assigned'] ) && $service_data['is_cname_assigned'] === 'yes' && ! empty( $service_data['domain'] ) ) {
722+
return strtolower( $service_data['domain'] );
723+
}
724+
725725
return sprintf(
726726
'%s.%s',
727727
strtolower( $service_data['cdn_key'] ),

0 commit comments

Comments
 (0)