Upgrade to 3.3.3

2020-01-20 12:19:33 +01:00
parent dd8a5e1ac3
commit 9c87f2fbc3
40 changed files with 1630 additions and 189 deletions
--- a/kirby/src/Image/Darkroom.php
+++ b/kirby/src/Image/Darkroom.php
@@ -65,6 +65,18 @@ class Darkroom
            $options['blur'] = 10;
        }

+        // normalize the greyscale option
+        if (isset($options['greyscale']) === true) {
+            $options['grayscale'] = $options['greyscale'];
+            unset($options['greyscale']);
+        }
+
+        // normalize the bw option
+        if (isset($options['bw']) === true) {
+            $options['grayscale'] = $options['bw'];
+            unset($options['bw']);
+        }
+
        if ($options['quality'] === null) {
            $options['quality'] = $this->settings['quality'];
        }