JI-3485 Include patch version in library folder name (storage)

Author: fnoks

h5peditor.class.php

@@ -403,7 +403,7 @@ public function getLibraryData($machineName, $majorVersion, $minorVersion, $lang
 
     // Get list of JS and CSS files that belongs to the dependencies
     $files = $this->h5p->getDependenciesFiles($libraries, $prefix);
-    $libraryName = H5PCore::libraryToString(compact('machineName', 'majorVersion', 'minorVersion'), true);
+    $libraryName = H5PCore::libraryToFolderName($library);
     if ($this->hasPresave($libraryName) === true) {
       $this->addPresaveFile($files, $library, $prefix);
     }
@@ -625,11 +625,13 @@ public function mergeLocalLibsIntoCachedLibs($local_libraries, &$cached_librarie
       // Check if icon is available locally:
       if ($local_lib->has_icon) {
         // Create path to icon:
-        $library_folder = H5PCore::libraryToString(array(
+        $library_folder = H5PCore::libraryToFolderName([
           'machineName' => $local_lib->machine_name,
           'majorVersion' => $local_lib->major_version,
-          'minorVersion' => $local_lib->minor_version
-        ), TRUE);
+          'minorVersion' => $local_lib->minor_version,
+          'patchVersion' => $local_lib->patch_version,
+          'patchVersionInFolderName' => $local_lib->patch_version_in_folder_name
+        ]);
         $icon_path = $this->h5p->h5pF->getLibraryFileUrl($library_folder, 'icon.svg');
       }
 
@@ -747,7 +749,7 @@ public function hasPresave($libraryName){
    * @param string $prefix
    */
   public function addPresaveFile(&$assets, $library, $prefix = ''){
-    $path = 'libraries' . '/' . H5PCore::libraryToString($library, true);
+    $path = 'libraries' . '/' . H5PCore::libraryToFolderName($library);
     if( array_key_exists('path', $library)){
       $path = $library['path'];
     }