v1.17.0: Improved URL encoding on JS video thumbnail generation

cloudinary · Sep 13, 2021 · b0a392b · b0a392b
1 parent 8ee2420
commit b0a392b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/view/adminhtml/web/js/cloudinary-media-library-modal.js b/view/adminhtml/web/js/cloudinary-media-library-modal.js
@@ -115,7 +115,7 @@ define([
                             asset.asset_derived_image_url
                             .replace(new RegExp('^.*cloudinary.com/(' + this.options.cloudinaryMLoptions.cloud_name + '/)?' + asset.resource_type + '/' + asset.type + '/'), '')
                             .replace(/\.[^/.]+$/, '')
-                            .replace(new RegExp('\/' + widget.escapeRegex(encodeURIComponent(asset.public_id)) + '$'), '')
+                            .replace(new RegExp('\/' + widget.escapeRegex(encodeURI(asset.public_id)) + '$'), '')
                             .replace(new RegExp('\/v[0-9]{1,10}$'), '')
                             .replace(new RegExp('\/'), ',');
                         if (widget.options.useDerived) {
@@ -126,7 +126,7 @@ define([
                         asset.asset_image_url = asset.asset_url
                             .replace(/\.[^/.]+$/, "")
                             .replace(new RegExp('\/v[0-9]{1,10}\/'), '/')
-                            .replace(new RegExp('\/(' + widget.escapeRegex(encodeURIComponent(asset.public_id)) + ')$'), '/so_auto/$1.jpg');
+                            .replace(new RegExp('\/(' + widget.escapeRegex(encodeURI(asset.public_id)) + ')$'), '/so_auto/$1.jpg');
                     }
                     $.ajax({
                         url: widget.options.imageUploaderUrl,

diff --git a/view/adminhtml/web/js/get-video-information.js b/view/adminhtml/web/js/get-video-information.js
@@ -641,7 +641,7 @@ define(
                         thumbnail = videoInfo.videoSrc
                             .replace(/\.[^/.]+$/, "")
                             .replace(new RegExp('\/v[0-9]{1,10}\/'), '/')
-                            .replace(new RegExp('\/(' + this._escapeRegex(encodeURIComponent(tmp.public_id)) + ')$'), '/so_auto/$1.jpg');
+                            .replace(new RegExp('\/(' + this._escapeRegex(encodeURI(tmp.public_id)) + ')$'), '/so_auto/$1.jpg');
 
                         //Fallback for video thumbnail image, use placeholder or store logo
                         $.ajax({