Skip to content

Commit 3865e1d

Browse files
johnhenleyjohnhenley
authored
Merge pull request #1541 from DNNCommunity/dev903
Sync DEV903 to master
2 parents f71e1cf + 08a4a14 commit 3865e1d

File tree

7 files changed

+35
-23
lines changed

7 files changed

+35
-23
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,11 @@ private void BuildPager()
12211221
pager1.View = Views.Topic;
12221222
pager1.TopicId = this.topic.TopicId;
12231223
pager1.PageMode = PagerNav.Mode.Links;
1224-
pager1.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo) + this.topic.TopicUrl;
1224+
if (this.MainSettings.URLRewriteEnabled)
1225+
{
1226+
pager1.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo) + this.topic.TopicUrl;
1227+
}
1228+
12251229
pager1.Params = @params.ToArray();
12261230
}
12271231

@@ -1237,7 +1241,11 @@ private void BuildPager()
12371241
pager2.View = Views.Topic;
12381242
pager2.TopicId = this.topic.TopicId;
12391243
pager2.PageMode = PagerNav.Mode.Links;
1240-
pager2.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo) + this.topic.TopicUrl;
1244+
if (this.MainSettings.URLRewriteEnabled)
1245+
{
1246+
pager2.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo) + this.topic.TopicUrl;
1247+
}
1248+
12411249
pager2.Params = @params.ToArray();
12421250
}
12431251
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,11 @@ private void BuildPager()
657657
intPages = Convert.ToInt32(System.Math.Ceiling(this.topicRowCount / (double)this.pageSize));
658658
pager1.PageCount = intPages;
659659
pager1.PageMode = PagerNav.Mode.Links;
660-
pager1.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo);
660+
if (this.MainSettings.URLRewriteEnabled)
661+
{
662+
pager1.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo);
663+
}
664+
661665
pager1.CurrentPage = this.PageId;
662666
pager1.TabID = Convert.ToInt32(this.Request.Params["TabId"]);
663667
pager1.ForumID = this.ForumId;
@@ -679,7 +683,10 @@ private void BuildPager()
679683
if (pager2 != null)
680684
{
681685
pager2.PageMode = Modules.ActiveForums.Controls.PagerNav.Mode.Links;
682-
pager2.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo);
686+
if (this.MainSettings.URLRewriteEnabled)
687+
{
688+
pager2.BaseURL = URL.ForumLink(this.TabId, this.ForumInfo);
689+
}
683690
pager2.UseShortUrls = this.MainSettings.UseShortUrls;
684691
pager2.PageCount = intPages;
685692
pager2.CurrentPage = this.PageId;

‎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.00.02.00</FileVersion>
16-
<AssemblyVersion>09.00.02.00</AssemblyVersion>
15+
<FileVersion>09.00.03.00</FileVersion>
16+
<AssemblyVersion>09.00.03.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.00.02">
3+
<package name="Active Forums" type="Module" version="09.00.03">
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.00.02</version>
89+
<version>09.00.03</version>
9090
</assembly>
9191
</assemblies>
9292
</component>
@@ -476,7 +476,7 @@
476476
</components>
477477
</package>
478478

479-
<package name="Active Forums What's New" type="Module" version="09.00.02">
479+
<package name="Active Forums What's New" type="Module" version="09.00.03">
480480

481481
<friendlyName>DNN Community Forums What's New</friendlyName>
482482
<foldername>ActiveForumsWhatsNew</foldername>
@@ -546,7 +546,7 @@
546546
</components>
547547
</package>
548548

549-
<package name="Active Forums Viewer" type="Module" version="09.00.02">
549+
<package name="Active Forums Viewer" type="Module" version="09.00.03">
550550
<friendlyName>DNN Community Forums Forums Viewer</friendlyName>
551551
<foldername>ActiveForumsViewer</foldername>
552552
<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.00.02">
3+
<package name="Active Forums_Symbols" type="Library" version="09.00.03">
44

55
<friendlyName>DNN Community Forums Symbols</friendlyName>
66
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
@@ -15,7 +15,7 @@
1515
<releaseNotes src="ReleaseNotes.txt" />
1616
<azureCompatible>True</azureCompatible>
1717
<dependencies>
18-
<dependency type="managedPackage" version="9.0.2">Active Forums</dependency>
18+
<dependency type="managedPackage" version="9.0.3">Active Forums</dependency>
1919
</dependencies>
2020
<components>
2121
<component type="ResourceFile">

‎Dnn.CommunityForums/ReleaseNotes.txt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,19 @@
4747
<hr />
4848

4949
<h3>
50-
09.00.02
50+
09.00.03
5151
</h3>
52-
<!--,,
52+
<!--
5353
<p>
5454
<b>THANK YOU</b> for all of the valuable contributions by
5555
<a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>
56-
<!--,,
5756
<a href="https://github.com/nvsai" target="_blank">@nvsai</a>,
5857
<a href="https://github.com/ernieblues" target="_blank">@nvsai</a>, and
5958
<a href="https://github.com/Timo-Breumelhof" target="_blank">@Timo-Breumelhof</a>
60-
-->.
61-
<!--,
6259
, and
6360
<a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>
6461
</p>
65-
-->.
62+
-->
6663
<p>
6764
What's to follow are all of the relevant updates that have occurred during the development cycle of this release.
6865
</p>
@@ -89,17 +86,17 @@
8986

9087
<h4>Bug Fixes</h4>
9188
<ul>
92-
<li>None at this time.</li>
89+
<li>FIXED: Incorrect URLs in navigation pager when not using friendly URLs (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1537">Issue 1537</a>)</li>
90+
9391
<!--
94-
<li>FIXED: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>!)</li>
95-
<li>None at this time.</li>
92+
<li>None at this time.</li>
9693
-->
9794
</ul>
9895

9996
<h4>Tasks / Development Updates (and Technical Debt)</h4>
10097
<ul>
10198

102-
<li>09.00.02 Release Prep (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1510">Issue 1510</a>)</li>
99+
<li>09.00.03 Release Prep (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1539">Issue 1539</a>)</li>
103100
<!--
104101
<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
105102
<li>None at this time.</li>

‎Dnn.CommunityForums/components/Helpers/URL.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static string ForumLink(int tabId, DotNetNuke.Modules.ActiveForums.Entiti
3232

3333
if (string.IsNullOrWhiteSpace(fi.PrefixURL) || !mainSettings.URLRewriteEnabled)
3434
{
35-
sURL = Utilities.NavigateURL(tabId, string.Empty, ParamKeys.ForumId + "=" + fi.ForumID);
35+
sURL = Utilities.NavigateURL(tabId, string.Empty, ParamKeys.ForumId + "=" + fi.ForumID) + "/";
3636
}
3737
else
3838
{

0 commit comments

Comments
 (0)