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

…ase/8.0
edu-sharing · Feb 28, 2024 · b32c120 · b32c120
2 parents 6f45e9b + 502a7a4
commit b32c120
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/service/src/main/php/src/tools/h5p/H5P.php b/service/src/main/php/src/tools/h5p/H5P.php
@@ -187,6 +187,7 @@ public function showEditor($content, Response $response) {
         foreach(\H5PEditor::$styles as $b) {
             $integration['editor']['assets']['css'][] = WWWURL . '/vendor/h5p/h5p-editor/' . $b;
         }
+        $integration['editor']['assets']['css'][] = WWWURL . '/src/tools/h5p/js/customEdu.css';
         foreach(\H5PCore::$scripts as $b) {
             $integration['editor']['assets']['js'][] = WWWURL . '/vendor/h5p/h5p-core/' . $b;
         }
@@ -228,8 +229,6 @@ public function showEditor($content, Response $response) {
         $scripts[] = WWWURL . '/src/tools/h5p/js/h5peditor-init.js';
 
 
-
-
         $titleShow = $_SESSION[$this->connectorId]['node']->node->title;
         if(empty($titleShow)){
             $titleShow = $_SESSION[$this->connectorId]['node']->node->name;

diff --git a/service/src/main/php/src/tools/h5p/H5PFramework.php b/service/src/main/php/src/tools/h5p/H5PFramework.php
@@ -336,10 +336,10 @@ 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;
+        return $statement->fetch() === false;
     }
 
     /**

diff --git a/service/src/main/php/src/tools/h5p/js/h5peditor-init.js b/service/src/main/php/src/tools/h5p/js/h5peditor-init.js
@@ -6,15 +6,13 @@
         H5PEditor.ajaxPath = H5PIntegration.editor.ajaxPath;
         H5PEditor.filesPath = H5PIntegration.editor.filesPath;
         H5PEditor.apiVersion = H5PIntegration.editor.apiVersion;
-        H5PEditor.contentLanguage = H5PIntegration.editor.language;
 
         // Semantics describing what copyright information can be stored for media.
         H5PEditor.copyrightSemantics = H5PIntegration.editor.copyrightSemantics;
         H5PEditor.metadataSemantics = H5PIntegration.editor.metadataSemantics;
 
         // Required styles and scripts for the editor
         H5PEditor.assets = H5PIntegration.editor.assets;
-        H5PEditor.assets.css.push('/src/tools/h5p/js/customEdu.css')
 
         // Required for assets
         H5PEditor.baseUrl = '';