Aklapper has uploaded a new change for review. https://gerrit.wikimedia.org/r/101643
Change subject: [4.4] Sync custom file with upstream 4.4 and reapply custom patch ...................................................................... [4.4] Sync custom file with upstream 4.4 and reapply custom patch DO NOT COMMIT until Bugzilla has been upgraded to 4.4. Sync custom file with upstream 4.4 and reapply custom patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=42606 Change-Id: I3915e58e9b88a47845e8c0b1aaf2b37877dd55d5 --- M template/en/custom/attachment/createformcontents.html.tmpl 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications refs/changes/43/101643/1 diff --git a/template/en/custom/attachment/createformcontents.html.tmpl b/template/en/custom/attachment/createformcontents.html.tmpl index 0b8fb43..863565c 100644 --- a/template/en/custom/attachment/createformcontents.html.tmpl +++ b/template/en/custom/attachment/createformcontents.html.tmpl @@ -21,6 +21,8 @@ # Marc Schumann <[email protected]> #%] +[% max_local = Param('maxlocalattachment') * 1024 %] +[% max_limit = Param('maxattachmentsize')> max_local ? Param('maxattachmentsize') : max_local %] <tr class="attachment_data"> <th><label for="data">File</label>:</th> <td> @@ -29,6 +31,7 @@ javascript:TUI_toggle_class('attachment_data')" >paste text as attachment</a>).<br> <input type="file" id="data" name="data" size="50" onchange="DataFieldHandler()"> + <br><em>(File size limit: [% max_limit FILTER html %] KB)</em> </td> </tr> <tr class="attachment_text_field"> @@ -100,6 +103,7 @@ {type => "image/gif", desc => "GIF image"}, {type => "image/jpeg", desc => "JPEG image"}, {type => "image/png", desc => "PNG image"}, + {type => "application/pdf", desc => "PDF document"}, {type => "application/octet-stream", desc => "binary file"}] %] [% Hook.process("mimetypes", "attachment/createformcontents.html.tmpl") %] -- To view, visit https://gerrit.wikimedia.org/r/101643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3915e58e9b88a47845e8c0b1aaf2b37877dd55d5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Aklapper <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
