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

Corrected a couple of incorrect format expansions #1127

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Corrected a couple of incorrect format expansions #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion store/src/java/com/zimbra/cs/filter/RuleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ private static void folderRenamed(Account account, String originalPath, String n
try {
node = parse(script);
} catch (ParseException e) {
ZimbraLog.filter.warn("Unable to update filter rules with new folder path '%s'.", e);
ZimbraLog.filter.warn("Unable to update filter rules with new folder path '%s'.", newPath, e);
return;
}
FolderRenamer renamer = new FolderRenamer(originalPath, newPath);
Expand Down
2 changes: 1 addition & 1 deletion store/src/java/com/zimbra/cs/service/FileUploadServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ List<Upload> handlePlainUpload(HttpServletRequest req, HttpServletResponse resp,
})) {
mLog.debug("handlePlainUpload(): deleting %s", fi);
fi.delete();
mLog.info("File content type is blacklisted : %s" + finalMimeType);
mLog.info("File content type is blacklisted : %s", finalMimeType);
drainRequestStream(req);
sendResponse(resp, HttpServletResponse.SC_FORBIDDEN, fmt, null, null, null);
return Collections.emptyList();
Expand Down