Changed version numbers to 06.01.07

Author: raphael-m

2Sexy Content Razor/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.1.6.0")]
-[assembly: AssemblyFileVersion("6.1.6.0")]
+[assembly: AssemblyVersion("6.1.7.0")]
+[assembly: AssemblyFileVersion("6.1.7.0")]

2sic_2SexyContent.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="2SexyContent" type="Module" version="06.01.06">
+    <package name="2SexyContent" type="Module" version="06.01.07">
       <friendlyName> Content</friendlyName>
       <description>2Sexy Content is a DotNetNuke Extension to create attractive and designed content. It solves the common problem, allowing the web designer to create designed templates for different content elements, so that the user must only fill in fields and receive a perfectly designed and animated output.</description>
       <iconFile>icon.png</iconFile>
@@ -123,7 +123,7 @@
             <script type="UnInstall">
               <path>SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>06.01.06</version>
+              <version>06.01.07</version>
             </script>
           </scripts>
         </component>
@@ -574,7 +574,7 @@
       </components>
     </package>
 
-    <package name="2SexyContent-App" type="Module" version="06.01.06">
+    <package name="2SexyContent-App" type="Module" version="06.01.07">
       <friendlyName> App</friendlyName>
       <description>2Sexy Content App is an extension that allows to insert a 2SexyContent app.</description>
       <iconFile>icon-app.png</iconFile>

Js/2sxc.api.js

@@ -99,6 +99,6 @@ var $2sxc = function (id) {
 
 $2sxc._controllers = {};
 $2sxc.metaName = "The 2SexyContent Controller object";
-$2sxc.metaVersion = "06.01.06";
+$2sxc.metaVersion = "06.01.07";
 $2sxc.beta = {};
 $2sxc._data = {};

Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("6.1.6.0")]
-[assembly: AssemblyFileVersion("6.1.6.0")]
+[assembly: AssemblyVersion("6.1.7.0")]
+[assembly: AssemblyFileVersion("6.1.7.0")]

SexyContent/SexyContent.cs

@@ -1,8 +1,11 @@
 using System.Data.Objects;
 using DotNetNuke.Common;
+using DotNetNuke.Common.Internal;
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Entities.Modules;
 using DotNetNuke.Entities.Portals;
+using DotNetNuke.Entities.Portals.Internal;
+using DotNetNuke.Entities.Tabs.Internal;
 using DotNetNuke.Security;
 using DotNetNuke.Security.Permissions;
 using DotNetNuke.Security.Roles;
@@ -39,7 +42,7 @@ public class SexyContent : ModuleSearchBase, IUpgradeable
     {
         #region Constants
 
-        public const string ModuleVersion = "06.01.06";
+        public const string ModuleVersion = "06.01.07";
         public const string TemplateID = "TemplateID";
         public const string ContentGroupIDString = "ContentGroupID";
         public const string AppIDString = "AppId";
@@ -1266,22 +1269,27 @@ public static string ResolveHyperlinkValues(string value, PortalSettings ownerPo
                         resultString = fileManager.GetUrl(fileInfo) + urlParams;
                     break;
                 case "page":
-                    var portalId = ownerPortalSettings.PortalId;
-                    var tabInfo = tabController.GetTab(id, portalId, false);
+                    var portalSettings = PortalSettings.Current;
+
+                    // Get full PortalSettings (with portal alias) if module sharing is active
+                    if (PortalSettings.Current != null && PortalSettings.Current.PortalId != ownerPortalSettings.PortalId)
+                    {
+                        var portalAlias = ownerPortalSettings.PrimaryAlias ?? TestablePortalAliasController.Instance.GetPortalAliasesByPortalId(ownerPortalSettings.PortalId).First();
+                        portalSettings = new PortalSettings(id, portalAlias);
+                    }
+                    var tabInfo = tabController.GetTab(id, ownerPortalSettings.PortalId, false);
                     if (tabInfo != null)
                     {
-                        //tabInfo.IsDefaultLanguage && 
                         if (tabInfo.CultureCode != "" && tabInfo.CultureCode != PortalSettings.Current.CultureCode)
                         {
-                            var cultureTabInfo = tabController.GetTabByCulture(tabInfo.TabID, tabInfo.PortalID,
-                                                                    LocaleController.Instance.GetLocale(
-                                                                        PortalSettings.Current.CultureCode));
+                            var cultureTabInfo = tabController.GetTabByCulture(tabInfo.TabID, tabInfo.PortalID, LocaleController.Instance.GetLocale(PortalSettings.Current.CultureCode));
 
                             if (cultureTabInfo != null)
                                 tabInfo = cultureTabInfo;
                         }
 
-                        resultString = Globals.NavigateURL(tabInfo.TabID, ownerPortalSettings, "", new string[] {}) + urlParams;
+                        // Exception in AdvancedURLProvider because ownerPortalSettings.PortalAlias is null
+                        resultString = Globals.NavigateURL(tabInfo.TabID, portalSettings, "", new string[] { }) + urlParams;
                     }
                     break;
             }