Merge remote-tracking branch 'origin/maven/fixes/9.0' into maven/rele…

…ase/9.0
edu-sharing · Sep 26, 2024 · a6caae2 · a6caae2
2 parents 3228ffd + 2bae21d
commit a6caae2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/service/src/main/php/src/tools/h5p/H5PFramework.php b/service/src/main/php/src/tools/h5p/H5PFramework.php
@@ -340,7 +340,7 @@ public function isPatchedLibrary($library)
           WHERE name = ' . $db->quote($library['machineName']) . '
           AND major_version = ' . (int)$library['majorVersion'] . '
           AND minor_version = ' . (int)$library['minorVersion'] . '
-          AND patch_version = ' . (int)$library['patchVersion'];
+          AND patch_version >= ' . (int)$library['patchVersion'];
 
         $statement = $db->query($query);
         return $statement->fetch() === false;

diff --git a/service/src/main/php/src/tools/onlyoffice/storage/templates/init.docx b/service/src/main/php/src/tools/onlyoffice/storage/templates/init.docx