Skip to content

Commit 5cc53c9

Browse files
authored
[stable15] Reset and init new user form language (#17652)
[stable15] Reset and init new user form language
2 parents cb28c21 + e46719c commit 5cc53c9

File tree

11 files changed

+6738
-4610
lines changed

11 files changed

+6738
-4610
lines changed

.drone.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ steps:
8383
- name: handlebars
8484
image: node
8585
commands:
86-
- npm install handlebars -g
86+
# we use 4.1.0 in our build folder
87+
- npm install handlebars@4.1.0 -g
8788
- ./build/compile-handlebars-templates.sh
8889

8990
trigger:

apps/workflowengine/lib/Check/FileMimeType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function setFileInfo(IStorage $storage, $path) {
8383
* @param string $mimeType
8484
* @return string
8585
*/
86-
protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
86+
protected function cacheAndReturnMimeType(string $storageId, string $path, string $mimeType): string {
8787
if ($path !== null && $this->storage->file_exists($path)) {
8888
$this->mimeType[$storageId][$path] = $mimeType;
8989
}

0 commit comments

Comments
 (0)