Merge pull request #12 from kentico-timothyf/master

Fixing Canonical Url creation and relaxed domain validation
Kentico · Aug 31, 2017 · 0125681 · 0125681
2 parents dd0d623 + 7874134
commit 0125681
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/CMS/App_Data/CIRepository/@global/cms.class/acceleratedmobilepages.ampfilter.xml b/CMS/App_Data/CIRepository/@global/cms.class/acceleratedmobilepages.ampfilter.xml
diff --git a/CMS/App_Data/CIRepository/@global/cms.resource/kentico.acceleratedmobilepages.xml b/CMS/App_Data/CIRepository/@global/cms.resource/kentico.acceleratedmobilepages.xml
diff --git a/..._Data/CIRepository/@global/cms.resourcesite/[email protected] b/..._Data/CIRepository/@global/cms.resourcesite/[email protected]
diff --git a/CMS/App_Data/CIRepository/@global/cms.settingskey/ampfilterdomainalias.xml b/CMS/App_Data/CIRepository/@global/cms.settingskey/ampfilterdomainalias.xml
diff --git a/Kentico.AcceleratedMobilePages/AmpFilter.cs b/Kentico.AcceleratedMobilePages/AmpFilter.cs
@@ -69,7 +69,7 @@ private string AppendAmpHtmlLink(string finalHtml)
         {
             string ampLink = (CMSHttpContext.Current.Request.IsSecureConnection ? Constants.P_HTTPS : Constants.P_HTTP) +
                              SettingsKeyInfoProvider.GetValue(SiteContext.CurrentSiteName + ".AMPFilterDomainAlias") +
-                             DocumentContext.CurrentAliasPath +
+                             (DocumentContext.CurrentPageInfo.DocumentUrlPath ?? DocumentContext.CurrentAliasPath) +
                              SettingsKeyInfoProvider.GetValue(SiteContext.CurrentSiteName + ".CMSFriendlyURLExtension");
             string metaTag = String.Format(Constants.AMP_AMP_HTML_LINK, ampLink) + Constants.NEW_LINE;
             // Insert meta tag
@@ -235,7 +235,7 @@ private string InsertCompulsoryMarkupAndCss(string finalHtml)
 
             // Create a link pointing to the regular HTML version of the page
             string canonicalLink = (CMSHttpContext.Current.Request.IsSecureConnection ? Constants.P_HTTPS : Constants.P_HTTP) +
-                                   SiteContext.CurrentSite.DomainName + DocumentContext.CurrentAliasPath +
+                                   SiteContext.CurrentSite.DomainName + (DocumentContext.CurrentPageInfo.DocumentUrlPath ?? DocumentContext.CurrentAliasPath) +
                                    SettingsKeyInfoProvider.GetValue(SiteContext.CurrentSiteName + ".CMSFriendlyURLExtension");
 
             // Extend the <head> tag with the compulsory markup and CSS styles