Merge branch 'dev' into stable3

Change-Id: I682bf1214afa34fa763805ce9f6a7882afc7ed4c
andi34 · Aug 13, 2021 · 8f7cdd8 · 8f7cdd8
2 parents 3f43c45 + 1c43ad5
commit 8f7cdd8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/collage.php b/lib/collage.php
@@ -32,6 +32,7 @@ function createCollage($srcImagePaths, $destImagePath, $filter = 'plain') {
     $rotate_after_creation = false;
     $quality = 100;
     $image_filter = false;
+    $imageModified = false;
     if (!empty($filter) && $filter !== 'plain') {
         $image_filter = $filter;
     }

diff --git a/yarn.lock b/yarn.lock
@@ -4103,9 +4103,9 @@ path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"