Merge branch 'MC-30636' of https://github.com/magento-tango/magento2ce into Tango-PR-03-17-2020-24

Author: Roman Lytvynenko

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js

@@ -168,17 +168,22 @@ define([
                     /(<span class="[^"]*magento-widget[^"]*"[^>]*>)?<img([^>]+id="[^>]+)>(([^>]*)<\/span>)?/i,
                     function (match) {
                         var attributes = wysiwyg.parseAttributesString(match[2]),
-                            widgetCode;
+                            widgetCode,
+                            result = match[0];
 
                         if (attributes.id) {
-                            widgetCode = Base64.idDecode(attributes.id);
+                            try {
+                                widgetCode = Base64.idDecode(attributes.id);
+                            } catch (e) {
+                                // Ignore and continue.
+                            }
 
-                            if (widgetCode.indexOf('{{widget') !== -1) {
-                                return widgetCode;
+                            if (widgetCode && widgetCode.indexOf('{{widget') !== -1) {
+                                result = widgetCode;
                             }
                         }
 
-                        return match[0];
+                        return result;
                     }
                 );
             },