Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot] Merge 23.11 to 24.1 #1794

Merged
merged 3 commits into from
Jan 16, 2024
+2 −2
Merged

[bot] Merge 23.11 to 24.1 #1794

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a10ec67
replace usages of q() with h() where appropriate (#1786)
labkey-matthewb Jan 11, 2024
dceff06
Merge 23.7 to 23.11
labkey-teamcity Jan 15, 2024
f352e44
Merge 23.11 to 24.1
labkey-teamcity Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function toggleRecorder(checkbox)
}
</script>
<!--Fake data region for ease of testing.-->
<table id=<%=q(emailRegion.getDomId())%> lk-region-name=<%=q(emailRegion.getName())%> class="labkey-data-region-legacy labkey-show-borders">
<table id="<%=h(emailRegion.getDomId())%>" lk-region-name="<%=h(emailRegion.getName())%>" class="labkey-data-region-legacy labkey-show-borders">
<colgroup><col width="120"/><col width="120"/><col width="125"/><col width="400"></colgroup>
<!-- hidden TRs where the header region and message box would normally be in a real data region -->
<tr style="display:none"><td colspan="5">&nbsp;</td></tr>
Expand Down Expand Up @@ -209,7 +209,7 @@ function toggleRecorder(checkbox)
}
}
%>
<tr id=<%=q(renderId)%> style="display: <%=unsafe(messages.length > 0 ? "none" : "")%>;"><td colspan="6">No email recorded.</td></tr>
<tr id="<%=h(renderId)%>" style="display: <%=unsafe(messages.length > 0 ? "none" : "")%>;"><td colspan="6">No email recorded.</td></tr>
</table>
<%
if (getUser().hasRootAdminPermission())
Expand Down
Loading