diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-09-06 21:59:14 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-09-06 21:59:14 +0200 |
| commit | d4f362fdfe17c885e417334b6677963193aa3542 (patch) | |
| tree | 5e4857874e9dc38159b1fc56da2b5ac56b9fae60 | |
| parent | 23eaf62659795d6fa1d0b48ab3cf32ecd75f4d33 (diff) | |
Sync with ikiwiki 3.20160506.
| -rw-r--r-- | ikiwiki/pagespec/attachment.mdwn | 2 | ||||
| -rw-r--r-- | wikiicons/email.png | bin | 550 -> 550 bytes | |||
| -rw-r--r-- | wikiicons/revert.png | bin | 397 -> 397 bytes |
3 files changed, 1 insertions, 1 deletions
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 Binary files differindex bab85e5..8bba3ae 100644 --- a/wikiicons/email.png +++ b/wikiicons/email.png diff --git a/wikiicons/revert.png b/wikiicons/revert.png Binary files differindex 7de03b7..caa5e4e 100644 --- a/wikiicons/revert.png +++ b/wikiicons/revert.png |
