when building links, skip both, /custom_domain/ and <custom_domain>

This commit is contained in:
Igor Galić 2019-08-20 15:04:29 +02:00
parent 768f126f1d
commit df7adaf0e0
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86

View File

@ -389,7 +389,10 @@ macro_rules! url {
$($common_args = $common_args,)* $($common_args = $common_args,)*
$($custom_args = $custom_args,)* $($custom_args = $custom_args,)*
); );
let path = origin.segments().skip(1).map(|seg| format!("/{}", seg)).collect::<String>(); //first segment is domain, drop it let path = origin
.segments() // first segment is /custom_domain,
.skip(2)// second is <domain>, drop both
.map(|seg| format!("/{}", seg)).collect::<String>();
let query = origin.query().map(|q| format!("?{}", q)).unwrap_or_default(); let query = origin.query().map(|q| format!("?{}", q)).unwrap_or_default();
format!("https://{}{}{}", &domain, path, query) format!("https://{}{}{}", &domain, path, query)
} else { } else {