From d4f362fdfe17c885e417334b6677963193aa3542 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 6 Sep 2017 21:59:14 +0200 Subject: Sync with ikiwiki 3.20160506. --- ikiwiki/pagespec/attachment.mdwn | 2 +- wikiicons/email.png | Bin 550 -> 550 bytes wikiicons/revert.png | Bin 397 -> 397 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn index fa2bc58..868fb23 100644 --- a/ikiwiki/pagespec/attachment.mdwn +++ b/ikiwiki/pagespec/attachment.mdwn @@ -12,7 +12,7 @@ while allowing larger mp3 files to be uploaded by joey into a specific directory, and check all attachments for viruses, something like this could be used: - virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb))) + virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or ((mimetype(image/jpeg) or mimetype(image/png)) and maxsize(50kb))) The regular [[ikiwiki/PageSpec]] syntax is expanded with the following additional tests: diff --git a/wikiicons/email.png b/wikiicons/email.png index bab85e5..8bba3ae 100644 Binary files a/wikiicons/email.png and b/wikiicons/email.png differ diff --git a/wikiicons/revert.png b/wikiicons/revert.png index 7de03b7..caa5e4e 100644 Binary files a/wikiicons/revert.png and b/wikiicons/revert.png differ -- cgit v1.2.3