Skip to content

Commit cdc9c5d

Browse files
WillStrohlWillStrohl
authored
Merge pull request #1238 from DNNCommunity/dev
Syncing branches for 8.2.1 GA release
2 parents 1286bf5 + cd38898 commit cdc9c5d

File tree

9 files changed

+56
-314
lines changed

9 files changed

+56
-314
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class TopicView : ForumBase
7373

7474
public string OptDefaultSort { get; set; }
7575

76-
public string MetaTemplate { get; set; } = "[META][TITLE][FORUMTOPIC:SUBJECT] - [PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][BODY:255][/DESCRIPTION][KEYWORDS][TAGS][VALUE][/KEYWORDS][/META]";
76+
public string MetaTemplate { get; set; } = "[META][TITLE][FORUMTOPIC:SUBJECT] - [PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][FORUMTOPIC:BODY:255][/DESCRIPTION][KEYWORDS][TAGS][VALUE][/KEYWORDS][/META]";
7777

7878
public string MetaTitle { get; set; } = string.Empty;
7979

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

+1-31
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class TopicsView : ForumBase
5555
private bool isSubscribedForum;
5656
private bool useListActions;
5757

58-
public string MetaTemplate { get; set; } = "[META][TITLE][PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][BODY][/DESCRIPTION][KEYWORDS][VALUE][/KEYWORDS][/META]";
58+
public string MetaTemplate { get; set; } = "[META][TITLE][PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][FORUM:FORUMDESCRIPTION][/DESCRIPTION][KEYWORDS][VALUE][/KEYWORDS][/META]";
5959

6060
public string MetaTitle { get; set; } = string.Empty;
6161

@@ -229,36 +229,6 @@ protected override void OnLoad(EventArgs e)
229229
{
230230
this.MetaTemplate = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.RemoveObsoleteTokens(new StringBuilder( this.MetaTemplate)).ToString();
231231
this.MetaTemplate = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumTokens(new StringBuilder(this.MetaTemplate), this.ForumInfo, this.PortalSettings, this.MainSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl).ToString();
232-
this.MetaTemplate = this.MetaTemplate.Replace("[TAGS]", string.Empty);
233-
if (this.MetaTemplate.Contains("[TOPICSUBJECT:"))
234-
{
235-
string pattern = "(\\[TOPICSUBJECT:(.+?)\\])";
236-
foreach (Match m in RegexUtils.GetCachedRegex(pattern, RegexOptions.Compiled & RegexOptions.IgnoreCase, 2).Matches(this.MetaTemplate))
237-
{
238-
this.MetaTemplate = this.MetaTemplate.Replace(m.Value, string.Empty);
239-
}
240-
}
241-
242-
this.MetaTemplate = this.MetaTemplate.Replace("[TOPICSUBJECT]", string.Empty);
243-
if (this.MetaTemplate.Contains("[BODY:"))
244-
{
245-
string pattern = "(\\[BODY:(.+?)\\])";
246-
foreach (Match m in RegexUtils.GetCachedRegex(pattern, RegexOptions.Compiled & RegexOptions.IgnoreCase, 2).Matches(this.MetaTemplate))
247-
{
248-
int iLen = Convert.ToInt32(m.Groups[2].Value);
249-
if (this.ForumInfo.ForumDesc.Length > iLen)
250-
{
251-
this.MetaTemplate = this.MetaTemplate.Replace(m.Value, this.ForumInfo.ForumDesc.Substring(0, iLen) + "...");
252-
}
253-
else
254-
{
255-
this.MetaTemplate = this.MetaTemplate.Replace(m.Value, this.ForumInfo.ForumDesc);
256-
}
257-
}
258-
}
259-
260-
this.MetaTemplate = this.MetaTemplate.Replace("[BODY]", Utilities.StripHTMLTag(this.ForumInfo.ForumDesc));
261-
262232
this.MetaTitle = TemplateUtils.GetTemplateSection(this.MetaTemplate, "[TITLE]", "[/TITLE]").Replace("[TITLE]", string.Empty).Replace("[/TITLE]", string.Empty);
263233
this.MetaTitle = this.MetaTitle.TruncateAtWord(SEOConstants.MaxMetaTitleLength);
264234
this.MetaDescription = TemplateUtils.GetTemplateSection(this.MetaTemplate, "[DESCRIPTION]", "[/DESCRIPTION]").Replace("[DESCRIPTION]", string.Empty).Replace("[/DESCRIPTION]", string.Empty);

‎Dnn.CommunityForums/DnnCommunityForums.dnn

+18-18
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="08.02.00">
3+
<package name="Active Forums" type="Module" version="08.02.01">
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>08.02.00</version>
89+
<version>08.02.01</version>
9090
</assembly>
9191
</assemblies>
9292
</component>
@@ -385,24 +385,24 @@
385385
<version>08.01.00</version>
386386
</script>
387387
<script type="Install">
388-
<path>sql</path>
389-
<name>08.01.01.SqlDataProvider</name>
390-
<version>08.01.01</version>
391-
</script>
392-
<script type="Install">
393-
<path>sql</path>
394-
<name>08.02.00.SqlDataProvider</name>
388+
<path>sql</path>
389+
<name>08.01.01.SqlDataProvider</name>
390+
<version>08.01.01</version>
391+
</script>
392+
<script type="Install">
393+
<path>sql</path>
394+
<name>08.02.00.SqlDataProvider</name>
395+
<version>08.02.00</version>
396+
</script>
397+
<script type="Install">
398+
<path>sql</path>
399+
<name>08.02.00.SqlDataProvider</name>
395400
<version>08.02.00</version>
396401
</script>
397-
<script type="Install">
398-
<path>sql</path>
399-
<name>08.02.00.SqlDataProvider</name>
400-
<version>08.02.00</version>
401-
</script>
402-
<script type="UnInstall">
402+
<script type="UnInstall">
403403
<path>sql</path>
404404
<name>Uninstall.SqlDataProvider</name>
405-
<version>08.02.00</version>
405+
<version>08.02.01</version>
406406
</script>
407407
</scripts>
408408
</component>
@@ -444,7 +444,7 @@
444444
</components>
445445
</package>
446446

447-
<package name="Active Forums What's New" type="Module" version="08.02.00">
447+
<package name="Active Forums What's New" type="Module" version="08.02.01">
448448

449449
<friendlyName>DNN Community Forums What's New</friendlyName>
450450
<foldername>ActiveForumsWhatsNew</foldername>
@@ -514,7 +514,7 @@
514514
</components>
515515
</package>
516516

517-
<package name="Active Forums Viewer" type="Module" version="08.02.00">
517+
<package name="Active Forums Viewer" type="Module" version="08.02.01">
518518
<friendlyName>DNN Community Forums Forums Viewer</friendlyName>
519519
<foldername>ActiveForumsViewer</foldername>
520520
<description>DNN Community Forums: Display any forum topic view on any page within your site.</description>

‎Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn

+2-2
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="08.02.00">
3+
<package name="Active Forums_Symbols" type="Library" version="08.02.01">
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="8.2.0">Active Forums</dependency>
18+
<dependency type="managedPackage" version="8.2.1">Active Forums</dependency>
1919
</dependencies>
2020
<components>
2121
<component type="ResourceFile">

‎Dnn.CommunityForums/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
// You can specify all the values or you can default the Build and Revision Numbers
5353
// by using the '*' as shown below:
5454

55-
[assembly: AssemblyVersion("08.02.00")]
55+
[assembly: AssemblyVersion("08.02.01")]
5656

57-
[assembly: AssemblyFileVersion("08.02.00")]
57+
[assembly: AssemblyFileVersion("08.02.01")]
5858

5959
[assembly: WebResource("DotNetNuke.Modules.ActiveForums.CustomControls.Resources.cb.js", "text/javascript")]
6060
[assembly: WebResource("DotNetNuke.Modules.ActiveForums.scripts.afadmin.properties.js", "text/javascript")]

0 commit comments

Comments
 (0)