Skip to content

Commit c36b98b

Browse files
johnhenleyjohnhenley
authored
Merge pull request #1805 from DNNCommunity/dev
TASK: Sync dev to master
2 parents 1cc5711 + e70cd33 commit c36b98b

8 files changed

Lines changed: 18 additions & 19 deletions

File tree

‎Dnn.CommunityForums/Classic.ascx.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,6 @@ private void GetControl(string view, string options)
302302
}
303303
}
304304
}
305-
else if (this.ForumId > 0)
306-
{
307-
this.ForumIds = new System.Collections.Generic.HashSet<int> { this.ForumId };
308-
}
309305
else if (!this.ForumIds.Any())
310306
{
311307
this.ForumIds = this.UserForumsList;

‎Dnn.CommunityForums/CustomControls/UserControls/ForumView.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ namespace DotNetNuke.Modules.ActiveForums.Controls
3232
using System.Web.UI.WebControls;
3333

3434
using DotNetNuke.Common.Utilities;
35+
using DotNetNuke.Modules.ActiveForums.Extensions;
3536

3637
[DefaultProperty("Text"), ToolboxData("<{0}:ForumView runat=server></{0}:ForumView>")]
3738
public class ForumView : ForumBase
@@ -198,7 +199,7 @@ public string BuildForumView()
198199

199200
if (this.Forums == null)
200201
{
201-
string cachekey = string.Format(CacheKeys.ForumViewForUser, this.ForumModuleId, this.ForumUser.UserId, this.ForumIds, HttpContext.Current?.Response?.Cookies["language"]?.Value);
202+
string cachekey = string.Format(CacheKeys.ForumViewForUser, this.ForumModuleId, this.ForumUser.UserId, this.ForumIds.FromHashSetToDelimitedString(";"), HttpContext.Current?.Response?.Cookies["language"]?.Value, this.ForumUser.RunningInViewer);
202203
var obj = DotNetNuke.Modules.ActiveForums.DataCache.ContentCacheRetrieve(this.ForumModuleId, cachekey);
203204
if (obj == null)
204205
{

‎Dnn.CommunityForums/DnnCommunityForums.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<Description>Discussion Forum Module for DNN</Description>
1313
<Company>dnncommunity.org</Company>
1414
<Authors>dnncommunity.org</Authors>
15-
<FileVersion>09.06.03.00</FileVersion>
16-
<AssemblyVersion>09.06.03.00</AssemblyVersion>
15+
<FileVersion>09.06.04.00</FileVersion>
16+
<AssemblyVersion>09.06.04.00</AssemblyVersion>
1717
<IncludeSymbols>False</IncludeSymbols>
1818
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
1919
<AnalysisLevel>latest</AnalysisLevel>

‎Dnn.CommunityForums/DnnCommunityForums.dnn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums" type="Module" version="09.06.03">
3+
<package name="Active Forums" type="Module" version="09.06.04">
44
<friendlyName>DNN Community Forums</friendlyName>
55
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png</iconFile>
@@ -86,7 +86,7 @@
8686
<assembly>
8787
<name>DotNetNuke.Modules.ActiveForums.dll</name>
8888
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
89-
<version>09.06.03</version>
89+
<version>09.06.04</version>
9090
</assembly>
9191
</assemblies>
9292
</component>
@@ -521,7 +521,7 @@
521521
<component type="Cleanup" version="09.06.00" fileName="09.06.00.txt" />
522522
</components>
523523
</package>
524-
<package name="Active Forums What's New" type="Module" version="09.06.03">
524+
<package name="Active Forums What's New" type="Module" version="09.06.04">
525525

526526
<friendlyName>DNN Community Forums What's New</friendlyName>
527527
<foldername>ActiveForumsWhatsNew</foldername>
@@ -591,7 +591,7 @@
591591
</components>
592592
</package>
593593

594-
<package name="Active Forums Viewer" type="Module" version="09.06.03">
594+
<package name="Active Forums Viewer" type="Module" version="09.06.04">
595595
<friendlyName>DNN Community Forums Forums Viewer</friendlyName>
596596
<foldername>ActiveForumsViewer</foldername>
597597
<description>DNN Community Forums: Display any forum topic view on any page within your site.</description>

‎Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums_Symbols" type="Library" version="09.06.03">
3+
<package name="Active Forums_Symbols" type="Library" version="09.06.04">
44
<friendlyName>DNN Community Forums Symbols</friendlyName>
55
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png</iconFile>
@@ -14,7 +14,7 @@
1414
<releaseNotes src="ReleaseNotes.txt" />
1515
<azureCompatible>True</azureCompatible>
1616
<dependencies>
17-
<dependency type="managedPackage" version="9.6.3">Active Forums</dependency>
17+
<dependency type="managedPackage" version="9.6.4">Active Forums</dependency>
1818
</dependencies>
1919
<components>
2020
<component type="ResourceFile">

‎Dnn.CommunityForums/ReleaseNotes.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
DNN Community Forums Release Notes
4747
</h2>
4848
<h3>
49-
09.06.03
49+
09.06.04
5050
</h3>
5151
<!--
5252
<p>
@@ -96,8 +96,7 @@
9696
<h4>Bug Fixes</h4>
9797

9898
<ul>
99-
<li>FIX: Control Panel Badges list doesn't load if no badges defined and no badge image folder (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1795">Issue 1795</a>)</li>
100-
<li>FIX: Badges images have incorrect URL / Unable to create unit test that accesses PortalSettings.DefaultPortalAlias (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1797">Issue 1797</a>)</li>
99+
<li>FIX: Friendly URL paging not working correctly (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1803">Issue 1803</a>)</li>
101100
<!--
102101
<li>None at this time.</li>
103102

@@ -110,11 +109,14 @@
110109
<h4>Tasks / Development Updates (and Technical Debt Reduction)</h4>
111110
<ul>
112111

112+
<li>None at this time.</li>
113+
114+
<!--
115+
113116
<li>Forum Viewer should use DNN Resource Manager to load module.css not load it directly (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1792">Issue 1792</a>)</li>
114117
<li>Remove legacy calendar.css associated with previously-removed date picker control (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1723">Issue 1723</a>)</li>
115118
<li>09.06.03 Release Prep (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1800">Issue 1800</a>)</li>
116119

117-
<!--
118120
<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
119121
<li>None at this time.</li>
120122
-->

‎Dnn.CommunityForums/class/Globals.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ public class CacheKeys
500500
public const string ForumListXml = "AF-{0}-flx";
501501
public const string Tokens = "AF-{0}-tk-{1}";
502502
public const string ForumViewPrefix = "AF-{0}-FV-";
503-
public const string ForumViewForUser = "AF-{0}-FV-{1}-{2}-{3}";
503+
public const string ForumViewForUser = "AF-{0}-FV-{1}-{2}-{3}-{4}";
504504
public const string TopicViewPrefix = "AF-{0}-TV-";
505505
public const string TopicViewForUser = "AF-{0}-TV-{1}-{2}-{3}-{4}-{5}";
506506
public const string TopicsViewPrefix = "AF-{0}-TVS-";

‎Dnn.CommunityForums/components/Extensions/ReWriter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public void OnBeginRequest(object s, EventArgs e)
187187
else
188188
{
189189
// if page number is part of the url, remove it, it will be restored later
190-
if (searchURL.ToCharArray().Where(c => c.Equals('/')).Count() > 5)
190+
if (searchURL.ToCharArray().Where(c => c.Equals('/')).Count() > 2)
191191
{
192192
foreach (string up in searchURL.Split('/'))
193193
{

0 commit comments

Comments
 (0)