Skip to content

Commit ce2b2a9

Browse files
committed
Fixed cmdCancel error #3
1 parent 478d3c3 commit ce2b2a9

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

branches/DNN_5/Forum_PostReport.ascx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525
<ul class="dnnActions dnnClear">
2626
<li><asp:linkbutton cssclass="dnnPrimaryAction" id="cmdReport" runat="server" resourcekey="cmdReport" /></li>
27-
<li><asp:HyperLink cssclass="dnnSecondaryAction" id="cmdCancel" runat="server" resourcekey="cmdCancel" /></li>
27+
<li><asp:linkbutton cssclass="dnnSecondaryAction" id="cmdCancel" runat="server" resourcekey="cmdCancel" /></li>
2828
</ul>
2929
</fieldset>
3030
</div>

branches/DNN_5/Forum_PostReport.ascx.designer.vb

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

branches/DNN_5/Forum_PostReport.ascx.vb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,6 @@ Namespace DotNetNuke.Modules.Forum
118118
ForumUtils.LoadCssFile(DefaultPage, objConfig)
119119

120120
If Page.IsPostBack = False Then
121-
If Not Request.UrlReferrer Is Nothing Then
122-
cmdCancel.NavigateUrl = Request.UrlReferrer.ToString()
123-
Else
124-
cmdCancel.NavigateUrl = NavigateURL()
125-
End If
126-
127121
PopulatePost(_PostInfo)
128122
PopulateTemplateDDL()
129123

@@ -139,6 +133,14 @@ Namespace DotNetNuke.Modules.Forum
139133
End Try
140134
End Sub
141135

136+
Protected Sub cmdCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmdCancel.Click
137+
If Not ViewState("UrlReferrer") Is Nothing Then
138+
Response.Redirect(CType(ViewState("UrlReferrer"), String), False)
139+
Else
140+
Response.Redirect(NavigateURL())
141+
End If
142+
End Sub
143+
142144
''' <summary>
143145
''' Reports a post as abusive
144146
''' </summary>

0 commit comments

Comments
 (0)