Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/MAGETWO-66885' into PR_08062017
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmytro Vilchynskyi committed Jun 8, 2017
2 parents d32eb22 + b1827bc commit 4a14208
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,6 @@ define([
var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+)'));

content = decodeURIComponent(content);

return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind
return Base64.mageDecode(match[1]);
});
Expand Down

0 comments on commit 4a14208

Please sign in to comment.