Skip to content

Commit fe1c772

Browse files
authored
Merge pull request DNNCommunity#304 from johnhenley/issues/709prep
add back missing code lines
2 parents d4a83fb + ee2fb69 commit fe1c772

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ActiveForums.dnn

+2-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@
373373
<path>sql</path>
374374
<name>Uninstall.SqlDataProvider</name>
375375
<version>07.00.09</version>
376-
</script>
376+
</script>
377+
</scripts>
377378
</component>
378379
<component type="ResourceFile">
379380
<resourceFiles>

ForumSettings.ascx.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ protected override void OnLoad(EventArgs e)
6969
rdEnableURLRewriter.SelectedIndex = 1;
7070
rdEnableURLRewriter.Enabled = false;
7171
}
72-
var u = DotNetNuke.Entities.Users.UserController.Instance.GetCurrentUserInfo();
73-
if (u.IsSuperUser & (HttpRuntime.IISVersion.Major >= 7) &!(PortalSettings.PortalAlias.HTTPAlias.Contains("/")))
72+
var u = DotNetNuke.Entities.Users.UserController.Instance.GetCurrentUserInfo();
73+
if (u.IsSuperUser & (HttpRuntime.IISVersion.Major >= 7) &!(PortalSettings.PortalAlias.HTTPAlias.Contains("/")))
7474
{
7575
if (Utilities.IsRewriteLoaded())
7676
{

controls/af_post.ascx.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,7 @@ private void ctlForm_Click(object sender, EventArgs e)
271271
// if someone activates this checkbox send him home :-)
272272
Response.Redirect("about:blank");
273273
}
274-
var iFloodInterval = MainSettings.FloodInterval;
275-
if (iFloodInterval > 0)
274+
if (!Utilities.HasFloodIntervalPassed(floodInterval: MainSettings.FloodInterval, user: ForumUser, forumInfo: ForumInfo))
276275
{
277276
plhMessage.Controls.Add(new InfoMessage { Message = "<div class=\"afmessage\">" + string.Format(GetSharedResource("[RESX:Error:FloodControl]"), MainSettings.FloodInterval) + "</div>" });
278277
return;

0 commit comments

Comments
 (0)